From helpdesk at onehippo.com Mon Mar 1 12:09:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 1 12:13:49 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3898) Docbase raises IllegalArgumentException (possibly broken) In-Reply-To: <5501723.3088.1267191230337.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <18345936.4092.1267441790607.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3898?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3898: ------------------------------------ Fix Version/s: r2.12.06 r2.13.00 > Docbase raises IllegalArgumentException (possibly broken) > --------------------------------------------------------- > > Key: HREPTWO-3898 > URL: http://issues.onehippo.com/browse/HREPTWO-3898 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Priority: High > Fix For: r2.12.06, r2.13.00 > > Attachments: error > > > When using the Docbase primitive element. > STEPS: > ------ > - Create Namespace (mynamespace|http://www.ns.net/01) > - Update All Content > - Create Document Type (mydoctype) > - Insert Docbase > - Save&Done > - Update all Content > - Create Root Folder (myfolder) > - Create Document (mydoc < mydoctype) > - Click [...] in Docbase in 'mydoc' > EXPECTED: > --------- > something like a dialog opening that lets the user pick up a document > ACTUAL: > ------- > nothing obvious apparently takes place, but the messages (see attached 'error') at the Tomcat Console. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 1 12:23:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 1 12:27:49 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3870) State not properly cleared after removing facet search node In-Reply-To: <20485414.826.1266969290360.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22432098.4118.1267442630438.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3870?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3870: ------------------------------------ Fix Version/s: r2.12.06 Must be fixed on 2.12 otherwise replication does not work properly - which is part of 7.3 > State not properly cleared after removing facet search node > ----------------------------------------------------------- > > Key: HREPTWO-3870 > URL: http://issues.onehippo.com/browse/HREPTWO-3870 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Bart van der Schans > Assignee: Berry van Halderen > Priority: High > Fix For: r2.12.06, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 1 14:53:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 1 14:57:49 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3903) Icon not set for a new file added to the library Message-ID: <20015554.4305.1267451630394.JavaMail.jira@jira.vm.castaserver.com> Icon not set for a new file added to the library ------------------------------------------------ Key: HREPTWO-3903 URL: http://issues.onehippo.com/browse/HREPTWO-3903 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.05 Environment: WinXP SP3 Fx 3.6 IE 7 IE 8 Sun JDK 1.6.0_18 Hippo CMS version 2.12.05 (Hippo Repository 2.12.05) Reporter: Sylvain P?lissier Attachments: document_icons.png When a Microsoft Office file is added by means of the Assets 'Add a file to the library' dialog, it gets a generic icon. When later the same file is uploaded again by means of the Upload button that is available on the document form resulting form the above operation, it gets a specific Microsoft Office icon. STEPS: ------ - do Add a File from Assets > hippos (quickstart) - select a .doc or a .xls file - verify the icon in the Folder Tabulation panel looks 'generic' like on the attached screenshot - edit this document and upload the (same) file again (Browse to the file, then Upload it) - now the icon should be the 'default' blue W or green X, depending on the type uploaded above. Note also that I have not been able to reorder the content of Assets so that the assets with the generic icon would appear first in the list. Should I put it be in Jira too? Note also that I will log another similar/related? issue separately. It has to do with adding images to Assets and whether or not a thumbnail is created. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 1 15:27:44 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 1 15:31:44 2010 Subject: [HippoRepos-dev] [21996] hippo-ecm: HREPTWO-16: services are not registered with the plugin manager with null name; so don 't unregister Message-ID: <20100301142744.053C91C020@svn.vm.castaserver.com> Revision: 21996 Author: fvlankvelt Date: 2010-03-01 15:27:43 +0100 (Mon, 01 Mar 2010) Log Message: ----------- HREPTWO-16: services are not registered with the plugin manager with null name; so don't unregister Modified Paths: -------------- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginContext.java 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 2010-03-01 13:52:35 UTC (rev 21995) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/impl/PluginContext.java 2010-03-01 14:27:43 UTC (rev 21996) @@ -234,7 +234,9 @@ + " is unregistering service at " + name + " that wasn't registered."); } } else { - manager.unregisterService(service, name); + if (name != null) { + manager.unregisterService(service, name); + } } } else { log.warn("plugin " + (plugin != null ? plugin.getClass().getName() : "") From svn-logs at hippocms.org Mon Mar 1 15:39:35 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 1 15:43:36 2010 Subject: [HippoRepos-dev] [21997] hippo-ecm: HREPTWO-16: encrypt URLs Message-ID: <20100301143935.C3F1C1C020@svn.vm.castaserver.com> Revision: 21997 Author: fvlankvelt Date: 2010-03-01 15:39:35 +0100 (Mon, 01 Mar 2010) Log Message: ----------- HREPTWO-16: encrypt URLs When the "encrypt-urls" init parameter is set to "true", all action URLs in the CMS are encrypted with a per-session (unique) key. Modified Paths: -------------- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java 2010-03-01 14:27:43 UTC (rev 21996) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java 2010-03-01 14:39:35 UTC (rev 21997) @@ -81,6 +81,7 @@ public final static String DEFAULT_REPOSITORY_DIRECTORY = "WEB-INF/storage"; public final static String MAXUPLOAD_PARAM = "upload-limit"; public final static String PLUGIN_APPLICATION_NAME = "config"; + public final static String ENCRYPT_URLS = "encrypt-urls"; @Override protected void init() { Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java 2010-03-01 14:27:43 UTC (rev 21996) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java 2010-03-01 14:39:35 UTC (rev 21997) @@ -15,10 +15,13 @@ */ package org.hippoecm.frontend; +import org.apache.wicket.Application; import org.apache.wicket.IRequestTarget; import org.apache.wicket.Page; import org.apache.wicket.RequestCycle; import org.apache.wicket.protocol.http.WebRequestCycleProcessor; +import org.apache.wicket.protocol.http.request.CryptedUrlWebRequestCodingStrategy; +import org.apache.wicket.request.IRequestCodingStrategy; import org.apache.wicket.request.target.component.BookmarkablePageRequestTarget; import org.apache.wicket.request.target.component.IPageRequestTarget; @@ -49,4 +52,16 @@ } } } + + @Override + protected IRequestCodingStrategy newRequestCodingStrategy() { + Main main = (Main) Application.get(); + String encrypt = main.getInitParameter(Main.ENCRYPT_URLS); + if (encrypt != null && "true".equals(encrypt)) { + return new CryptedUrlWebRequestCodingStrategy(super.newRequestCodingStrategy()); + } else { + return super.newRequestCodingStrategy(); + } + } + } From svn-logs at hippocms.org Mon Mar 1 15:44:46 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 1 15:48:48 2010 Subject: [HippoRepos-dev] [21998] hippo-ecm: HREPTWO-16: backport URL encryption Message-ID: <20100301144446.A84AF1C020@svn.vm.castaserver.com> Revision: 21998 Author: fvlankvelt Date: 2010-03-01 15:44:45 +0100 (Mon, 01 Mar 2010) Log Message: ----------- HREPTWO-16: backport URL encryption Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java 2010-03-01 14:39:35 UTC (rev 21997) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java 2010-03-01 14:44:45 UTC (rev 21998) @@ -81,6 +81,7 @@ public final static String DEFAULT_REPOSITORY_DIRECTORY = "WEB-INF/storage"; public final static String MAXUPLOAD_PARAM = "upload-limit"; public final static String PLUGIN_APPLICATION_NAME = "config"; + public final static String ENCRYPT_URLS = "encrypt-urls"; @Override protected void init() { Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java 2010-03-01 14:39:35 UTC (rev 21997) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/PluginRequestCycleProcessor.java 2010-03-01 14:44:45 UTC (rev 21998) @@ -15,10 +15,13 @@ */ package org.hippoecm.frontend; +import org.apache.wicket.Application; import org.apache.wicket.IRequestTarget; import org.apache.wicket.Page; import org.apache.wicket.RequestCycle; import org.apache.wicket.protocol.http.WebRequestCycleProcessor; +import org.apache.wicket.protocol.http.request.CryptedUrlWebRequestCodingStrategy; +import org.apache.wicket.request.IRequestCodingStrategy; import org.apache.wicket.request.target.component.BookmarkablePageRequestTarget; import org.apache.wicket.request.target.component.IPageRequestTarget; @@ -49,4 +52,16 @@ } } } + + @Override + protected IRequestCodingStrategy newRequestCodingStrategy() { + Main main = (Main) Application.get(); + String encrypt = main.getInitParameter(Main.ENCRYPT_URLS); + if (encrypt != null && "true".equals(encrypt)) { + return new CryptedUrlWebRequestCodingStrategy(super.newRequestCodingStrategy()); + } else { + return super.newRequestCodingStrategy(); + } + } + } Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 From svn-logs at hippocms.org Mon Mar 1 16:33:30 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 1 16:37:31 2010 Subject: [HippoRepos-dev] [22000] hippo-ecm: HREPTWO-3870: this will avoid the issue alltogether Message-ID: <20100301153330.E4D261C020@svn.vm.castaserver.com> Revision: 22000 Author: bvanhalderen Date: 2010-03-01 16:33:30 +0100 (Mon, 01 Mar 2010) Log Message: ----------- HREPTWO-3870: this will avoid the issue alltogether Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java 2010-03-01 15:28:28 UTC (rev 21999) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java 2010-03-01 15:33:30 UTC (rev 22000) @@ -95,6 +95,16 @@ @Override protected void disconnect() { + try { + if (session != null && session.isLive()) { + session.logout(); + log.debug("Disconnecting from Hippo Repository at '{}'.", getRepositoryAddress()); + } + } catch (Exception e) { + log.warn("Error while disconnecting from Hippo Repository: {}.", e); + } finally { + session = null; + } } //------------------------------- Remote Session methods -------------------------// From helpdesk at onehippo.com Mon Mar 1 16:43:50 2010 From: helpdesk at onehippo.com (JIRA (Vijay Kiran)) Date: Mon Mar 1 16:47:50 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3904) Warning Messages in the Log after removing a field and update all content Message-ID: <1859442.4423.1267458230530.JavaMail.jira@jira.vm.castaserver.com> Warning Messages in the Log after removing a field and update all content ------------------------------------------------------------------------- Key: HREPTWO-3904 URL: http://issues.onehippo.com/browse/HREPTWO-3904 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.05 Reporter: Vijay Kiran 1. Start CMS QuickStart WAR. 2. Create a test document using Article Type. 3. Publish the document. 4. Open the Article Document Template from Configuration 5. Edit and remove one of the fields. 6. Save template and update all content. Every 10sec (due to Ping) in the log I see : 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/defaultcontent/article/editor:templates/_default_ 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/hipposysedit/templatetype/editor:templates/_default_/rootLayout 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/hipposysedit/templatetype/editor:templates/_default_ 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/defaultcontent/article 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:configuration/hippo:frontend/cms/cms-preview 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/hippostd/html/editor:templates/_default_ 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/system/String/editor:templates/_default_ -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 1 17:00:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 1 17:04:49 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3905) Pictures uploaded as assets with a temporary thumbnail Message-ID: <21548562.4440.1267459250445.JavaMail.jira@jira.vm.castaserver.com> Pictures uploaded as assets with a temporary thumbnail ------------------------------------------------------ Key: HREPTWO-3905 URL: http://issues.onehippo.com/browse/HREPTWO-3905 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.05 Environment: WinXP SP3 Fx 3.6 IE 7 IE 8 Sun JDK 1.6.0_18 Hippo CMS version 2.12.05 (Hippo Repository 2.12.05) Reporter: Sylvain P?lissier Attachments: screenshot-1.png, screenshot-2.png Uploading a picture is possible from Images as well as from Assets. From Images, a thumbnail as well as the original picture are visible on the form of the document. From Assets however, while a thumbnail only is visible at creation, it disappears and is replaced by the original later on. STEPS: ------ - do Add a File from Assets > hippos (quickstart) - select a .png, a .jpg or a .jpeg file - verify that a document is created with the name of the file, for example mypicture.png - verify that a thumbnail of the original file is visible on the document (screenshot-1) - edit the document, and use the browse button to select the same file again, upload it - verify that the thumbnail has disappeared - verify that the full size picture is now visible (screenshot-2) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 1 17:00:50 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Mon Mar 1 17:04:50 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3906) Searching for document with 2 words as search string leads to exception in logs Message-ID: <2515197.4447.1267459250623.JavaMail.jira@jira.vm.castaserver.com> Searching for document with 2 words as search string leads to exception in logs ------------------------------------------------------------------------------- Key: HREPTWO-3906 URL: http://issues.onehippo.com/browse/HREPTWO-3906 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.05 Reporter: Jeroen Reijn CMS 2010-03-01 16:58:04,942 ERROR [org.hippoecm.frontend.plugins.standards.search.TextSearchBuilder] Error executing query[text]: //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) javax.jcr.query.InvalidQueryException: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" for statement: for $v in //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) return $v: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":": Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.(XPathQueryBuilder.java:303) at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.createQuery(XPathQueryBuilder.java:332) at org.apache.jackrabbit.spi.commons.query.xpath.QueryBuilder.createQueryTree(QueryBuilder.java:39) at org.apache.jackrabbit.spi.commons.query.QueryParser.parse(QueryParser.java:57) at org.apache.jackrabbit.core.query.lucene.QueryImpl.(QueryImpl.java:92) at org.apache.jackrabbit.core.query.lucene.SearchIndex.createExecutableQuery(SearchIndex.java:618) at org.apache.jackrabbit.core.query.QueryImpl.init(QueryImpl.java:128) at org.apache.jackrabbit.core.SearchManager.createQuery(SearchManager.java:316) at org.apache.jackrabbit.core.query.QueryManagerImpl.createQuery(QueryManagerImpl.java:102) at org.hippoecm.repository.decorating.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) at org.hippoecm.repository.impl.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) at org.hippoecm.repository.decorating.checked.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:48) at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:49) at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:27) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.plugins.standards.browse.BrowserSearchResult.getQueryResult(BrowserSearchResult.java:48) at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.load(SearchDocumentsProvider.java:65) at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.size(SearchDocumentsProvider.java:124) at org.hippoecm.frontend.plugins.standards.list.datatable.ListDataTable.render(ListDataTable.java:158) at org.hippoecm.frontend.plugins.cms.browse.list.SearchDocumentListingPlugin.render(SearchDocumentListingPlugin.java:151) at org.hippoecm.frontend.plugins.cms.browse.DocumentCollectionView.render(DocumentCollectionView.java:142) at org.hippoecm.frontend.plugins.cms.browse.Navigator.render(Navigator.java:103) at org.hippoecm.frontend.service.render.AbstractRenderService.render(AbstractRenderService.java:386) at org.hippoecm.frontend.service.render.RenderPlugin.render(RenderPlugin.java:124) at org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin.render(TabsPlugin.java:127) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 00:36:50 2010 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Tue Mar 2 00:40:50 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3907) Xinha: add option for turning off auto-url creation Message-ID: <15843854.4881.1267486610863.JavaMail.jira@jira.vm.castaserver.com> Xinha: add option for turning off auto-url creation --------------------------------------------------- Key: HREPTWO-3907 URL: http://issues.onehippo.com/browse/HREPTWO-3907 Project: Hippo Repository 2 Issue Type: New Feature Affects Versions: r2.13.00 Reporter: Arthur Bogaart Assignee: Arthur Bogaart -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:21:50 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Tue Mar 2 12:25:53 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3908) Update from 2.09 to 2.12 fails for some template fields Message-ID: <17574753.5181.1267528910345.JavaMail.jira@jira.vm.castaserver.com> Update from 2.09 to 2.12 fails for some template fields ------------------------------------------------------- Key: HREPTWO-3908 URL: http://issues.onehippo.com/browse/HREPTWO-3908 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.05 Reporter: Jeroen Reijn Attachments: incorrect-converted-types.png -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:23:50 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Tue Mar 2 12:27:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3908) Update from 2.09 to 2.12 fails for some template fields In-Reply-To: <17574753.5181.1267528910345.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30503535.5187.1267529030572.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3908?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jeroen Reijn updated HREPTWO-3908: ---------------------------------- Attachment: (was: incorrect-converted-types.png) > Update from 2.09 to 2.12 fails for some template fields > ------------------------------------------------------- > > Key: HREPTWO-3908 > URL: http://issues.onehippo.com/browse/HREPTWO-3908 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:25:50 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Tue Mar 2 12:29:52 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3908) Update from 2.09 to 2.12 fails for some template fields In-Reply-To: <17574753.5181.1267528910345.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <19463034.5189.1267529150413.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3908?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jeroen Reijn updated HREPTWO-3908: ---------------------------------- Attachment: incorrect-converted-types.png > Update from 2.09 to 2.12 fails for some template fields > ------------------------------------------------------- > > Key: HREPTWO-3908 > URL: http://issues.onehippo.com/browse/HREPTWO-3908 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Attachments: incorrect-converted-types.png > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:29:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 2 12:33:52 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3908) Update from 2.09 to 2.12 fails for some template fields In-Reply-To: <17574753.5181.1267528910345.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <5934653.5194.1267529390372.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3908?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3908: ------------------------------------ Assignee: Berry van Halderen Fix Version/s: r2.13.00 > Update from 2.09 to 2.12 fails for some template fields > ------------------------------------------------------- > > Key: HREPTWO-3908 > URL: http://issues.onehippo.com/browse/HREPTWO-3908 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Attachments: incorrect-converted-types.png > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:31:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 2 12:35:52 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3906) Searching for document with 2 words as search string leads to exception in logs In-Reply-To: <2515197.4447.1267459250623.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <6097888.5198.1267529510510.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3906?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3906: ------------------------------------ Assignee: Frank van Lankvelt (was: Stephan Westen) Fix Version/s: r2.13.00 Backport to 2.12.07 if impact on search result. Not if only impact on log file. > Searching for document with 2 words as search string leads to exception in logs > ------------------------------------------------------------------------------- > > Key: HREPTWO-3906 > URL: http://issues.onehippo.com/browse/HREPTWO-3906 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > CMS 2010-03-01 16:58:04,942 ERROR [org.hippoecm.frontend.plugins.standards.search.TextSearchBuilder] Error executing query[text]: //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) > javax.jcr.query.InvalidQueryException: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" for statement: for $v in //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) return $v: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":": Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.(XPathQueryBuilder.java:303) > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.createQuery(XPathQueryBuilder.java:332) > at org.apache.jackrabbit.spi.commons.query.xpath.QueryBuilder.createQueryTree(QueryBuilder.java:39) > at org.apache.jackrabbit.spi.commons.query.QueryParser.parse(QueryParser.java:57) > at org.apache.jackrabbit.core.query.lucene.QueryImpl.(QueryImpl.java:92) > at org.apache.jackrabbit.core.query.lucene.SearchIndex.createExecutableQuery(SearchIndex.java:618) > at org.apache.jackrabbit.core.query.QueryImpl.init(QueryImpl.java:128) > at org.apache.jackrabbit.core.SearchManager.createQuery(SearchManager.java:316) > at org.apache.jackrabbit.core.query.QueryManagerImpl.createQuery(QueryManagerImpl.java:102) > at org.hippoecm.repository.decorating.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.impl.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.decorating.checked.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:48) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:49) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:27) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.plugins.standards.browse.BrowserSearchResult.getQueryResult(BrowserSearchResult.java:48) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.load(SearchDocumentsProvider.java:65) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.size(SearchDocumentsProvider.java:124) > at org.hippoecm.frontend.plugins.standards.list.datatable.ListDataTable.render(ListDataTable.java:158) > at org.hippoecm.frontend.plugins.cms.browse.list.SearchDocumentListingPlugin.render(SearchDocumentListingPlugin.java:151) > at org.hippoecm.frontend.plugins.cms.browse.DocumentCollectionView.render(DocumentCollectionView.java:142) > at org.hippoecm.frontend.plugins.cms.browse.Navigator.render(Navigator.java:103) > at org.hippoecm.frontend.service.render.AbstractRenderService.render(AbstractRenderService.java:386) > at org.hippoecm.frontend.service.render.RenderPlugin.render(RenderPlugin.java:124) > at org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin.render(TabsPlugin.java:127) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:50:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 2 12:54:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3904) Warning Messages in the Log after removing a field and update all content In-Reply-To: <1859442.4423.1267458230530.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10418705.5205.1267530650384.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3904?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3904: ------------------------------------ Assignee: Frank van Lankvelt Fix Version/s: r2.13.00 > Warning Messages in the Log after removing a field and update all content > ------------------------------------------------------------------------- > > Key: HREPTWO-3904 > URL: http://issues.onehippo.com/browse/HREPTWO-3904 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Vijay Kiran > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > 1. Start CMS QuickStart WAR. > 2. Create a test document using Article Type. > 3. Publish the document. > 4. Open the Article Document Template from Configuration > 5. Edit and remove one of the fields. > 6. Save template and update all content. > Every 10sec (due to Ping) in the log I see : > 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/defaultcontent/article/editor:templates/_default_ > 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/hipposysedit/templatetype/editor:templates/_default_/rootLayout > 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/hipposysedit/templatetype/editor:templates/_default_ > 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/defaultcontent/article > 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:configuration/hippo:frontend/cms/cms-preview > 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/hippostd/html/editor:templates/_default_ > 01.03.2010 16:44:08 WARN [org.hippoecm.frontend.model.JcrItemModel.writeObject():267] Undetached JcrItemModel /hippo:namespaces/system/String/editor:templates/_default_ -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:52:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 2 12:56:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3896) NullPointerException on update_all_content after moving down, then deleting a Boolean In-Reply-To: <5104054.2977.1267187510404.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <33406798.5208.1267530770576.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3896?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3896: ------------------------------------ Assignee: Frank van Lankvelt Fix Version/s: r2.13.00 > NullPointerException on update_all_content after moving down, then deleting a Boolean > ------------------------------------------------------------------------------------- > > Key: HREPTWO-3896 > URL: http://issues.onehippo.com/browse/HREPTWO-3896 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: error > > > STEPS: > ------ > - Create Namespace (mynamespace/http://www.ns.net/0.1) > - Create Document Type (mydoctype) > - Insert Text (MyText/mytext) > - Insert Boolean > - Insert Text (YourText/yourtext) > - Save&Done > - Update All Content > - Create Root Folder (myfolder) > - Create Document (mydocument < mydoctype) > - Save&Done > - Publish mydocument > - Edit mydoctype > - Move Boolean Down > - Delete Boolean > - Insert Boolean > Note the following messages in the Tomcat Console: > ERROR [org.hippoecm.frontend.plugin.config.impl.JcrClusterConfig$PluginList.add():171] /hippo:namespaces/mynamespace/mydoctype/editor:templates/_default_/boolean > ERROR [org.hippoecm.editor.type.JcrTypeDescriptor.addField():199] failed to resolve path null relative to node /hippo:namespaces/mynamespace/mydoctype/hipposysedit:nodetype/hipposysedit:nodetype[2]: empty path > - Insert Boolean > Note the following message in the Hippo CMS screen: > Path mynamespace:boolean already exists, not adding field > - Save&Done > - Update All Content > Note the operation is successful > The attached file 'error' is a copy of the messages found in the Tomcat Console at the end the Update All Content (NullPointerException). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 12:52:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 2 12:56:54 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3905) Pictures uploaded as assets with a temporary thumbnail In-Reply-To: <21548562.4440.1267459250445.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17532855.5211.1267530770630.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3905?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3905: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 > Pictures uploaded as assets with a temporary thumbnail > ------------------------------------------------------ > > Key: HREPTWO-3905 > URL: http://issues.onehippo.com/browse/HREPTWO-3905 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > Attachments: screenshot-1.png, screenshot-2.png > > > Uploading a picture is possible from Images as well as from Assets. From Images, a thumbnail as well as the original picture are visible on the form of the document. From Assets however, while a thumbnail only is visible at creation, it disappears and is replaced by the original later on. > STEPS: > ------ > - do Add a File from Assets > hippos (quickstart) > - select a .png, a .jpg or a .jpeg file > - verify that a document is created with the name of the file, for example mypicture.png > - verify that a thumbnail of the original file is visible on the document (screenshot-1) > - edit the document, and use the browse button to select the same file again, upload it > - verify that the thumbnail has disappeared > - verify that the full size picture is now visible (screenshot-2) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 13:30:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 2 13:34:53 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3909) Tag 2.12.06 Message-ID: <28064813.5249.1267533050647.JavaMail.jira@jira.vm.castaserver.com> Tag 2.12.06 ----------- Key: HREPTWO-3909 URL: http://issues.onehippo.com/browse/HREPTWO-3909 Project: Hippo Repository 2 Issue Type: Task Affects Versions: r2.12.06 Reporter: Berry van Halderen Assignee: Berry van Halderen Priority: High Fix For: r2.12.06 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 13:36:07 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 2 13:40:12 2010 Subject: [HippoRepos-dev] [22004] hippo-ecm: HREPTWO-3909: bumb release information Message-ID: <20100302123607.2C5231C021@svn.vm.castaserver.com> Revision: 22004 Author: bvanhalderen Date: 2010-03-02 13:36:06 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3909: bumb release information Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-01 19:26:30 UTC (rev 22003) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-02 12:36:06 UTC (rev 22004) @@ -419,8 +419,8 @@ true true - HREPTWO-3883: - Tag-HREPTWO-v2_12_05 + HREPTWO-3909: + Tag-HREPTWO-v2_12_06 From helpdesk at onehippo.com Tue Mar 2 13:44:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 2 13:48:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3870) State not properly cleared after removing facet search node In-Reply-To: <20485414.826.1266969290360.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <1019040.5251.1267533890384.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3870?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3870: ---------------------------------------- Fix Version/s: (was: r2.12.06) The occurenance of this issue is fixed for 2.12.06, where replication does no longer run into this issue. The underlying cause of the issue can be addressed in 2.13, but it will probably never occur IRL elsewhere. > State not properly cleared after removing facet search node > ----------------------------------------------------------- > > Key: HREPTWO-3870 > URL: http://issues.onehippo.com/browse/HREPTWO-3870 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Bart van der Schans > Assignee: Berry van Halderen > Priority: High > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 13:44:50 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Tue Mar 2 13:48:53 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3897) If there is custom configuration for a project, the CMS update silently fails In-Reply-To: <31230235.3086.1267191110429.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2963344.5254.1267533890460.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3897?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85297#action_85297 ] Jeroen Reijn commented on HREPTWO-3897: --------------------------------------- Can sombody review this patch? It would be a shame if these minor improvements would not make it into the release. > If there is custom configuration for a project, the CMS update silently fails > ----------------------------------------------------------------------------- > > Key: HREPTWO-3897 > URL: http://issues.onehippo.com/browse/HREPTWO-3897 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Stephan Westen > Attachments: patch-HREPTWO-3897.txt > > > We have removed the assets tree, since we store assets as inline resources in a document type. Because the updater expects the node to be there our update process silently fails. I've attached a patch file, which is more explicit and checks for all cms frontend node if they are available. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 13:52:57 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 2 13:57:01 2010 Subject: [HippoRepos-dev] [22005] hippo-ecm: HREPTWO-3906: and together multiple keywords Message-ID: <20100302125257.7B6351C020@svn.vm.castaserver.com> Revision: 22005 Author: fvlankvelt Date: 2010-03-02 13:52:57 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3906: and together multiple keywords Modified Paths: -------------- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-02 12:36:06 UTC (rev 22004) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-02 12:52:57 UTC (rev 22005) @@ -86,11 +86,16 @@ boolean valid = false; StringBuilder querySb = new StringBuilder("//element(*, hippo:harddocument)["); StringBuilder scope = getScope(); + boolean hasCriteria = (scope != null); if (scope != null) { querySb.append(scope); - querySb.append(" and "); } for (StringTokenizer st = new StringTokenizer(value, " "); st.hasMoreTokens();) { + if (hasCriteria) { + querySb.append(" and "); + } else { + hasCriteria = true; + } querySb.append("jcr:contains(., '"); String token = st.nextToken(); if (token.length() < getMinimalLength()) { Modified: hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-02 12:36:06 UTC (rev 22004) +++ hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-02 12:52:57 UTC (rev 22005) @@ -15,7 +15,9 @@ */ package org.hippoecm.frontend.plugins.standards.search; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -44,6 +46,7 @@ "jcr:mixinTypes", "hippo:harddocument", "hippostd:state", "published", "title", "title", + "introduction", "introduction", "ab", "ab", }; String[] alternative = { @@ -95,6 +98,25 @@ } @Test + public void multipleKeywordsAreAllPresent() throws RepositoryException { + build(session, content); + build(session, alternative); + session.save(); + + TextSearchBuilder tsb = new TextSearchBuilder(); + tsb.setWildcardSearch(true); + tsb.setText("tit intr"); + assertNotNull(tsb.getResultModel()); + BrowserSearchResult bsr = tsb.getResultModel().getObject(); + int count = 0; + for (NodeIterator iter = bsr.getQueryResult().getNodes(); iter.hasNext();) { + iter.next(); + count++; + } + assertEquals(1, count); + } + + @Test public void wildcardSearchFindsWordHead() throws RepositoryException { build(session, content); session.save(); From helpdesk at onehippo.com Tue Mar 2 13:53:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 2 13:57:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3897) If there is custom configuration for a project, the CMS update silently fails In-Reply-To: <31230235.3086.1267191110429.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <32762464.5262.1267534430420.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3897?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3897: ------------------------------------ Assignee: Berry van Halderen (was: Stephan Westen) Fix Version/s: r2.12.07 > If there is custom configuration for a project, the CMS update silently fails > ----------------------------------------------------------------------------- > > Key: HREPTWO-3897 > URL: http://issues.onehippo.com/browse/HREPTWO-3897 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Berry van Halderen > Fix For: r2.12.07 > > Attachments: patch-HREPTWO-3897.txt > > > We have removed the assets tree, since we store assets as inline resources in a document type. Because the updater expects the node to be there our update process silently fails. I've attached a patch file, which is more explicit and checks for all cms frontend node if they are available. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 13:57:09 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 2 14:01:16 2010 Subject: [HippoRepos-dev] [22006] hippo-ecm: HREPTWO-3906: and together multiple keywords Message-ID: <20100302125709.DDFDA1C020@svn.vm.castaserver.com> Revision: 22006 Author: fvlankvelt Date: 2010-03-02 13:57:09 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3906: and together multiple keywords Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-02 12:52:57 UTC (rev 22005) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-02 12:57:09 UTC (rev 22006) @@ -86,11 +86,16 @@ boolean valid = false; StringBuilder querySb = new StringBuilder("//element(*, hippo:harddocument)["); StringBuilder scope = getScope(); + boolean hasCriteria = (scope != null); if (scope != null) { querySb.append(scope); - querySb.append(" and "); } for (StringTokenizer st = new StringTokenizer(value, " "); st.hasMoreTokens();) { + if (hasCriteria) { + querySb.append(" and "); + } else { + hasCriteria = true; + } querySb.append("jcr:contains(., '"); String token = st.nextToken(); if (token.length() < getMinimalLength()) { Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-02 12:52:57 UTC (rev 22005) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-02 12:57:09 UTC (rev 22006) @@ -15,7 +15,9 @@ */ package org.hippoecm.frontend.plugins.standards.search; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -44,6 +46,7 @@ "jcr:mixinTypes", "hippo:harddocument", "hippostd:state", "published", "title", "title", + "introduction", "introduction", "ab", "ab", }; String[] alternative = { @@ -95,6 +98,25 @@ } @Test + public void multipleKeywordsAreAllPresent() throws RepositoryException { + build(session, content); + build(session, alternative); + session.save(); + + TextSearchBuilder tsb = new TextSearchBuilder(); + tsb.setWildcardSearch(true); + tsb.setText("tit intr"); + assertNotNull(tsb.getResultModel()); + BrowserSearchResult bsr = tsb.getResultModel().getObject(); + int count = 0; + for (NodeIterator iter = bsr.getQueryResult().getNodes(); iter.hasNext();) { + iter.next(); + count++; + } + assertEquals(1, count); + } + + @Test public void wildcardSearchFindsWordHead() throws RepositoryException { build(session, content); session.save(); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 From helpdesk at onehippo.com Tue Mar 2 13:57:50 2010 From: helpdesk at onehippo.com (JIRA (Rob van der Linden Vooren)) Date: Tue Mar 2 14:01:54 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3910) UpdaterEngine swallows exceptions Message-ID: <27830376.5266.1267534670728.JavaMail.jira@jira.vm.castaserver.com> UpdaterEngine swallows exceptions --------------------------------- Key: HREPTWO-3910 URL: http://issues.onehippo.com/browse/HREPTWO-3910 Project: Hippo Repository 2 Issue Type: Bug Components: migration-utilities, repository-core Reporter: Rob van der Linden Vooren Priority: Blocker Hi, In our project, we are currently working very hard to implement some updater modules that will upgrade our content from CMS 2.09.06 to 2.12.05. We use the UpdaterItemVisitor.QueryVisitor to apply changes to nodes that match a given query. Running the query -that finds nodes on a given path of type hippo:handle, hippostd:directory, hippostd:folder- with the repository tool, returns 440 results. Our updatermodule that registers a UpdaterItemVisitor.QueryVisitor with the exact same query, eventually affects 432 nodes... Why? After some debugging we found the following: The UpdaterEngine, line 819-843 happily swallows exceptions such as PathNotFoundException, InvalidItemStateException, ItemNotFoundException. Additionally, these exception are not logged. This really does not help debugging any problems/bugs that are present, such as: Please address this. Regards, Rob -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 13:57:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Tue Mar 2 14:01:55 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3906) Searching for document with 2 words as search string leads to exception in logs In-Reply-To: <2515197.4447.1267459250623.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21582999.5269.1267534670780.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3906?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3906: ---------------------------------------- Fix Version/s: r2.12.06 > Searching for document with 2 words as search string leads to exception in logs > ------------------------------------------------------------------------------- > > Key: HREPTWO-3906 > URL: http://issues.onehippo.com/browse/HREPTWO-3906 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Fix For: r2.12.06, r2.13.00 > > > CMS 2010-03-01 16:58:04,942 ERROR [org.hippoecm.frontend.plugins.standards.search.TextSearchBuilder] Error executing query[text]: //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) > javax.jcr.query.InvalidQueryException: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" for statement: for $v in //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) return $v: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":": Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.(XPathQueryBuilder.java:303) > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.createQuery(XPathQueryBuilder.java:332) > at org.apache.jackrabbit.spi.commons.query.xpath.QueryBuilder.createQueryTree(QueryBuilder.java:39) > at org.apache.jackrabbit.spi.commons.query.QueryParser.parse(QueryParser.java:57) > at org.apache.jackrabbit.core.query.lucene.QueryImpl.(QueryImpl.java:92) > at org.apache.jackrabbit.core.query.lucene.SearchIndex.createExecutableQuery(SearchIndex.java:618) > at org.apache.jackrabbit.core.query.QueryImpl.init(QueryImpl.java:128) > at org.apache.jackrabbit.core.SearchManager.createQuery(SearchManager.java:316) > at org.apache.jackrabbit.core.query.QueryManagerImpl.createQuery(QueryManagerImpl.java:102) > at org.hippoecm.repository.decorating.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.impl.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.decorating.checked.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:48) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:49) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:27) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.plugins.standards.browse.BrowserSearchResult.getQueryResult(BrowserSearchResult.java:48) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.load(SearchDocumentsProvider.java:65) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.size(SearchDocumentsProvider.java:124) > at org.hippoecm.frontend.plugins.standards.list.datatable.ListDataTable.render(ListDataTable.java:158) > at org.hippoecm.frontend.plugins.cms.browse.list.SearchDocumentListingPlugin.render(SearchDocumentListingPlugin.java:151) > at org.hippoecm.frontend.plugins.cms.browse.DocumentCollectionView.render(DocumentCollectionView.java:142) > at org.hippoecm.frontend.plugins.cms.browse.Navigator.render(Navigator.java:103) > at org.hippoecm.frontend.service.render.AbstractRenderService.render(AbstractRenderService.java:386) > at org.hippoecm.frontend.service.render.RenderPlugin.render(RenderPlugin.java:124) > at org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin.render(TabsPlugin.java:127) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 14:03:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 2 14:07:52 2010 Subject: [HippoRepos-dev] [JIRA] Reopened: (HREPTWO-3887) Missing Done on Assets and Images tab In-Reply-To: <1450427.2620.1267114730378.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2936564.5274.1267535030428.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3887?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier reopened HREPTWO-3887: ---------------------------------------- Originally, the issue I wanted to raise is that once you Edit such a document, the preview mode changes. Most other documents can be set back to the original mode by means of the Done button. With images, there is no way I found to put the document back into the mode it was before I press Edit. That is why I thought it needed a Done button. > Missing Done on Assets and Images tab > ------------------------------------- > > Key: HREPTWO-3887 > URL: http://issues.onehippo.com/browse/HREPTWO-3887 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 > (Hippo Repository 2.12.04) > Reporter: Sylvain P?lissier > Assignee: Sylvain P?lissier > Priority: High > Fix For: r2.12.06, r2.13.00 > > Attachments: missing_done.png > > > STEPS > ----- > If you open an image (such as Images . Hippo.jpg) and/or an asset (such as Assets > Hippo.pdf), and then press Edit, you will notice that the Done button is missing next to the Save button. As a consequence, it is not possible to put the open document back into 'preview mode', that is the way it looked when it was first open. See attached missing_done. > But closing the document works, and once reopened shows the expected 'preview mode' state. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 14:03:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 2 14:07:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3887) Missing a means to reset Assets and Images documents (was: Missing Done on Assets and Images tab) In-Reply-To: <1450427.2620.1267114730378.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <24512940.5279.1267535030518.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3887?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3887: --------------------------------------- Summary: Missing a means to reset Assets and Images documents (was: Missing Done on Assets and Images tab) (was: Missing Done on Assets and Images tab) Assignee: Berry van Halderen (was: Sylvain P?lissier) > Missing a means to reset Assets and Images documents (was: Missing Done on Assets and Images tab) > ------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3887 > URL: http://issues.onehippo.com/browse/HREPTWO-3887 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 > (Hippo Repository 2.12.04) > Reporter: Sylvain P?lissier > Assignee: Berry van Halderen > Priority: High > Fix For: r2.12.06, r2.13.00 > > Attachments: missing_done.png > > > STEPS > ----- > If you open an image (such as Images . Hippo.jpg) and/or an asset (such as Assets > Hippo.pdf), and then press Edit, you will notice that the Done button is missing next to the Save button. As a consequence, it is not possible to put the open document back into 'preview mode', that is the way it looked when it was first open. See attached missing_done. > But closing the document works, and once reopened shows the expected 'preview mode' state. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 14:05:38 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 2 14:09:41 2010 Subject: [HippoRepos-dev] [22007] hippo-ecm: HREPTWO-3898: do not set null document model Message-ID: <20100302130538.0D4681C020@svn.vm.castaserver.com> Revision: 22007 Author: fvlankvelt Date: 2010-03-02 14:05:37 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3898: do not set null document model Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java 2010-03-02 12:57:09 UTC (rev 22006) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java 2010-03-02 13:05:37 UTC (rev 22007) @@ -147,7 +147,10 @@ //save modelServiceId and dialogServiceId in cluster config String modelServiceId = clusterConfig.getString("wicket.model"); final IModelReference modelRef = context.getService(modelServiceId, IModelReference.class); - modelRef.setModel(getInitialNode()); + IModel initial = getInitialNode(); + if (initial != null) { + modelRef.setModel(initial); + } context.registerService(modelObserver = new IObserver() { private static final long serialVersionUID = 1L; From helpdesk at onehippo.com Tue Mar 2 14:05:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 2 14:09:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3887) Missing a means to reset Assets and Images documents (was: Missing Done on Assets and Images tab) In-Reply-To: <1450427.2620.1267114730378.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3085505.5282.1267535150406.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3887?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3887: --------------------------------------- Priority: Normal (was: High) > Missing a means to reset Assets and Images documents (was: Missing Done on Assets and Images tab) > ------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3887 > URL: http://issues.onehippo.com/browse/HREPTWO-3887 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 > (Hippo Repository 2.12.04) > Reporter: Sylvain P?lissier > Assignee: Berry van Halderen > Fix For: r2.12.06, r2.13.00 > > Attachments: missing_done.png > > > STEPS > ----- > If you open an image (such as Images . Hippo.jpg) and/or an asset (such as Assets > Hippo.pdf), and then press Edit, you will notice that the Done button is missing next to the Save button. As a consequence, it is not possible to put the open document back into 'preview mode', that is the way it looked when it was first open. See attached missing_done. > But closing the document works, and once reopened shows the expected 'preview mode' state. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 14:07:42 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 2 14:11:47 2010 Subject: [HippoRepos-dev] [22008] hippo-ecm: HREPTWO-3898: do not set null document model Message-ID: <20100302130742.284EC1C020@svn.vm.castaserver.com> Revision: 22008 Author: fvlankvelt Date: 2010-03-02 14:07:41 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3898: do not set null document model Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java 2010-03-02 13:05:37 UTC (rev 22007) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/linkpicker/LinkPickerDialog.java 2010-03-02 13:07:41 UTC (rev 22008) @@ -147,7 +147,10 @@ //save modelServiceId and dialogServiceId in cluster config String modelServiceId = clusterConfig.getString("wicket.model"); final IModelReference modelRef = context.getService(modelServiceId, IModelReference.class); - modelRef.setModel(getInitialNode()); + IModel initial = getInitialNode(); + if (initial != null) { + modelRef.setModel(initial); + } context.registerService(modelObserver = new IObserver() { private static final long serialVersionUID = 1L; Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 From helpdesk at onehippo.com Tue Mar 2 14:09:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 2 14:13:52 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3887) Missing a means to reset Assets and Images documents (was: Missing Done on Assets and Images tab) In-Reply-To: <1450427.2620.1267114730378.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <5975290.5290.1267535390494.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3887?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3887: --------------------------------------- Fix Version/s: (was: r2.12.06) > Missing a means to reset Assets and Images documents (was: Missing Done on Assets and Images tab) > ------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3887 > URL: http://issues.onehippo.com/browse/HREPTWO-3887 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 > (Hippo Repository 2.12.04) > Reporter: Sylvain P?lissier > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Attachments: missing_done.png > > > STEPS > ----- > If you open an image (such as Images . Hippo.jpg) and/or an asset (such as Assets > Hippo.pdf), and then press Edit, you will notice that the Done button is missing next to the Save button. As a consequence, it is not possible to put the open document back into 'preview mode', that is the way it looked when it was first open. See attached missing_done. > But closing the document works, and once reopened shows the expected 'preview mode' state. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 14:09:50 2010 From: helpdesk at onehippo.com (JIRA (Rob van der Linden Vooren)) Date: Tue Mar 2 14:13:55 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3910) UpdaterEngine swallows exceptions In-Reply-To: <27830376.5266.1267534670728.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8107570.5294.1267535390547.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3910?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Rob van der Linden Vooren updated HREPTWO-3910: ----------------------------------------------- Description: Hi, In our project, we are currently working very hard to implement some updater modules that will upgrade our content from CMS 2.09.06 to 2.12.05. We use the UpdaterItemVisitor.QueryVisitor to apply changes to nodes that match a given query. Running the query -that finds nodes on a given path of type hippo:handle, hippostd:directory, hippostd:folder- with the repository tool, returns 440 results. Our updatermodule that registers a UpdaterItemVisitor.QueryVisitor with the exact same query, eventually affects 432 nodes... Why? After some debugging we found the following: The UpdaterEngine, line 819-843 happily swallows exceptions such as PathNotFoundException, InvalidItemStateException, ItemNotFoundException. Additionally, these exception are not logged. This really does not help debugging any problems/bugs that are present, such as: HREPTWO-3911 Please address this. Regards, Rob was: Hi, In our project, we are currently working very hard to implement some updater modules that will upgrade our content from CMS 2.09.06 to 2.12.05. We use the UpdaterItemVisitor.QueryVisitor to apply changes to nodes that match a given query. Running the query -that finds nodes on a given path of type hippo:handle, hippostd:directory, hippostd:folder- with the repository tool, returns 440 results. Our updatermodule that registers a UpdaterItemVisitor.QueryVisitor with the exact same query, eventually affects 432 nodes... Why? After some debugging we found the following: The UpdaterEngine, line 819-843 happily swallows exceptions such as PathNotFoundException, InvalidItemStateException, ItemNotFoundException. Additionally, these exception are not logged. This really does not help debugging any problems/bugs that are present, such as: Please address this. Regards, Rob > UpdaterEngine swallows exceptions > --------------------------------- > > Key: HREPTWO-3910 > URL: http://issues.onehippo.com/browse/HREPTWO-3910 > Project: Hippo Repository 2 > Issue Type: Bug > Components: migration-utilities, repository-core > Reporter: Rob van der Linden Vooren > Priority: Blocker > > Hi, > In our project, we are currently working very hard to implement some updater modules that will upgrade our content from CMS 2.09.06 to 2.12.05. > We use the UpdaterItemVisitor.QueryVisitor to apply changes to nodes that match a given query. > Running the query -that finds nodes on a given path of type hippo:handle, hippostd:directory, hippostd:folder- with the repository tool, returns 440 results. > Our updatermodule that registers a UpdaterItemVisitor.QueryVisitor with the exact same query, eventually affects 432 nodes... > Why? > After some debugging we found the following: > The UpdaterEngine, line 819-843 happily swallows exceptions such as PathNotFoundException, InvalidItemStateException, ItemNotFoundException. > Additionally, these exception are not logged. > This really does not help debugging any problems/bugs that are present, such as: HREPTWO-3911 > Please address this. > Regards, > Rob -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 14:09:50 2010 From: helpdesk at onehippo.com (JIRA (Rob van der Linden Vooren)) Date: Tue Mar 2 14:13:56 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3911) UpdaterEngine fails to handle same node sibblings while renaming them from a UpdaterItemVisitor.QueryVisitor Message-ID: <24848756.5292.1267535390517.JavaMail.jira@jira.vm.castaserver.com> UpdaterEngine fails to handle same node sibblings while renaming them from a UpdaterItemVisitor.QueryVisitor ------------------------------------------------------------------------------------------------------------ Key: HREPTWO-3911 URL: http://issues.onehippo.com/browse/HREPTWO-3911 Project: Hippo Repository 2 Issue Type: Bug Components: migration-utilities, repository-core Reporter: Rob van der Linden Vooren Priority: Blocker In our project, we are currently working very hard to implement some updater modules that will upgrade our content from CMS 2.09.06 to 2.12.05. We use the UpdaterItemVisitor.QueryVisitor to apply changes to nodes that match a given query. Running the query -that finds nodes on a given path of type hippo:handle, hippostd:directory, hippostd:folder- with the repository tool, returns 440 results. Our updatermodule that registers a UpdaterItemVisitor.QueryVisitor with the exact same query, eventually process 432 nodes successfully: These are localized and renamed. However, Some nodes fail to process (exception are swallowed silently: see HREPTWO-3910 ) . It seems that a PathNotFoundException is thrown when processing nodes (hippo:handle) with same name siblings. Our content contains nodes with the same name, such as: hippo:handle /content/mynode hippo:handle /content/mynode[2] These are apparently not processed correctly when we rename them (using UpdaterContext#setName) from out of our updater. Please help / look into this. Kind regards, Rob -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 14:19:21 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 2 14:23:26 2010 Subject: [HippoRepos-dev] [22009] hippo-ecm: HREPTWO-3897: applied patch Message-ID: <20100302131921.C0BCC1C020@svn.vm.castaserver.com> Revision: 22009 Author: bvanhalderen Date: 2010-03-02 14:19:21 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3897: applied patch Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java 2010-03-02 13:07:41 UTC (rev 22008) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java 2010-03-02 13:19:21 UTC (rev 22009) @@ -197,8 +197,10 @@ context.registerVisitor(new UpdaterItemVisitor.PathVisitor("/hippo:configuration/hippo:derivatives") { @Override protected void leaving(Node node, int level) throws RepositoryException { - Node reviewedAction = node.getNode("reviewed-action/hipposys:accessed/request"); - reviewedAction.setProperty("hipposys:relPath", "../request[@hippostdpubwf:type='publish']/type"); + if(node.hasNode("reviewed-action/hipposys:accessed/request")) { + Node reviewedAction = node.getNode("reviewed-action/hipposys:accessed/request"); + reviewedAction.setProperty("hipposys:relPath", "../request[@hippostdpubwf:type='publish']/type"); + } } }); @@ -235,70 +237,102 @@ context.registerVisitor(new UpdaterItemVisitor.PathVisitor("/hippo:configuration/hippo:frontend/cms") { @Override protected void leaving(Node node, int level) throws RepositoryException { - node.getNode("cms-browser/assetsTreeLoader/cluster.config").getProperty("wicket.model").remove(); + if(node.hasNode("cms-browser/assetsTreeLoader/cluster.config")) { + node.getNode("cms-browser/assetsTreeLoader/cluster.config").getProperty("wicket.model").remove(); + } + Node browser = node.getNode("cms-browser"); - Node bp = browser.getNode("browserPerspective"); - bp.getProperty("browser.viewers").remove(); - bp.getProperty("editor.id").remove(); - bp.getProperty("extension.list").remove(); - bp.getProperty("model.document").remove(); - bp.getProperty("model.folder").remove(); - bp.getProperty("model.folder.root").remove(); + if(browser.hasNode("browserPerspective")) { + Node bp = browser.getNode("browserPerspective"); + bp.getProperty("browser.viewers").remove(); + bp.getProperty("editor.id").remove(); + bp.getProperty("extension.list").remove(); + bp.getProperty("model.document").remove(); + bp.getProperty("model.folder").remove(); + bp.getProperty("model.folder.root").remove(); + } + // TODO: convert sections to navigation sections? - browser.getNode("browserPlugin").remove(); + if(browser.hasNode("browserPlugin")) { + browser.getNode("browserPlugin").remove(); + } - Node docTreeLoaderConfig = browser.getNode("documentsTreeLoader/cluster.config"); - docTreeLoaderConfig.setProperty("wicket.model", "model.browse.collection"); - docTreeLoaderConfig.getProperty("register.context.menu").remove(); - docTreeLoaderConfig.setProperty("workflow.enabled", true); + if(browser.hasNode("documentsTreeLoader")) { + Node docTreeLoaderConfig = browser.getNode("documentsTreeLoader/cluster.config"); + docTreeLoaderConfig.setProperty("wicket.model", "model.browse.collection"); + docTreeLoaderConfig.getProperty("register.context.menu").remove(); + docTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node confTreeLoaderConfig = browser.getNode("configurationTreeLoader/cluster.config"); - confTreeLoaderConfig.getProperty("wicket.model").remove(); - confTreeLoaderConfig.getProperty("register.context.menu").remove(); - confTreeLoaderConfig.setProperty("workflow.enabled", true); + if(browser.hasNode("configurationTreeLoader")) { + Node confTreeLoaderConfig = browser.getNode("configurationTreeLoader/cluster.config"); + confTreeLoaderConfig.getProperty("wicket.model").remove(); + confTreeLoaderConfig.getProperty("register.context.menu").remove(); + confTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node imagesTreeLoaderConfig = browser.getNode("imagesTreeLoader/cluster.config"); - imagesTreeLoaderConfig.getProperty("wicket.model").remove(); - imagesTreeLoaderConfig.getProperty("register.context.menu").remove(); - imagesTreeLoaderConfig.setProperty("workflow.enabled", true); + if(browser.hasNode("imagesTreeLoader")) { + Node imagesTreeLoaderConfig = browser.getNode("imagesTreeLoader/cluster.config"); + imagesTreeLoaderConfig.getProperty("wicket.model").remove(); + imagesTreeLoaderConfig.getProperty("register.context.menu").remove(); + imagesTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node assetsTreeLoaderConfig = browser.getNode("assetsTreeLoader/cluster.config"); - assetsTreeLoaderConfig.getProperty("register.context.menu").remove(); - assetsTreeLoaderConfig.setProperty("workflow.enabled", true); - - Node nav = browser.getNode("navigator"); - nav.getProperty("extension.browser").remove(); - nav.getProperty("wicket.extensions").remove(); - nav.setProperty("browser.id", "service.browse"); - nav.setProperty("browser.viewers", "cms-folder-views"); - nav.setProperty("model.default.path", "/content/documents"); - nav.setProperty("model.document", "model.browse.document"); - nav.setProperty("model.folder", "model.browse.folder"); - nav.setProperty("search.viewers", "cms-search-views"); - nav.setProperty("section.configuration", "service.browse.tree.configuration"); - nav.setProperty("section.content", "service.browse.tree.content"); - nav.setProperty("section.files", "service.browse.tree.files"); - nav.setProperty("section.images", "service.browse.tree.images"); - nav.setProperty("sections", new String[] { "section.content", "section.images", "section.files", "section.configuration" }); - nav.setProperty("wicket.variant", "yui"); + if(browser.hasNode("assetsTreeLoader")) { + Node assetsTreeLoaderConfig = browser.getNode("assetsTreeLoader/cluster.config"); + assetsTreeLoaderConfig.getProperty("register.context.menu").remove(); + assetsTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node dashLayout = node.getNode("cms-dashboard/dashboardLayout/yui.config"); - dashLayout.setProperty("units", new String[] {"top", "left", "center", "right"}); - dashLayout.setProperty("top", "id=top,height=23px"); + if(browser.hasNode("navigator")) { + Node nav = browser.getNode("navigator"); + nav.getProperty("extension.browser").remove(); + nav.getProperty("wicket.extensions").remove(); + nav.setProperty("browser.id", "service.browse"); + nav.setProperty("browser.viewers", "cms-folder-views"); + nav.setProperty("model.default.path", "/content/documents"); + nav.setProperty("model.document", "model.browse.document"); + nav.setProperty("model.folder", "model.browse.folder"); + nav.setProperty("search.viewers", "cms-search-views"); + nav.setProperty("section.configuration", "service.browse.tree.configuration"); + nav.setProperty("section.content", "service.browse.tree.content"); + nav.setProperty("section.files", "service.browse.tree.files"); + nav.setProperty("section.images", "service.browse.tree.images"); + nav.setProperty("sections", new String[] { "section.content", "section.images", "section.files", "section.configuration" }); + nav.setProperty("wicket.variant", "yui"); + } - node.getNode("cms-editor").remove(); - node.getNode("cms-preview").remove(); - node.getNode("cms-pickers").remove(); + if(node.hasNode("cms-dashboard/dashboardLayout/yui.config")) { + Node dashLayout = node.getNode("cms-dashboard/dashboardLayout/yui.config"); + dashLayout.setProperty("units", new String[] {"top", "left", "center", "right"}); + dashLayout.setProperty("top", "id=top,height=23px"); + } + if(node.hasNode("cms-editor")) { + node.getNode("cms-editor").remove(); + } + + if(node.hasNode("cms-preview")) { + node.getNode("cms-preview").remove(); + } + + if(node.hasNode("cms-pickers")) { + node.getNode("cms-pickers").remove(); + } + // TODO: upgrade iso replace - node.getNode("cms-tree-views").remove(); + if(node.hasNode("cms-tree-views")) { + node.getNode("cms-tree-views").remove(); + } - Node hidePubWf = node.getNode("cms-folder-views/hipposysedit:namespacefolder/root/filters").addNode("hideHippostdpubwfNamespace", "frontend:pluginconfig"); - hidePubWf.setProperty("display", false); - hidePubWf.setProperty("path", "/hippo:namespaces/hippostdpubwf"); + if(node.hasNode("cms-folder-views")) { + Node hidePubWf = node.getNode("cms-folder-views/hipposysedit:namespacefolder/root/filters").addNode("hideHippostdpubwfNamespace", "frontend:pluginconfig"); + hidePubWf.setProperty("display", false); + hidePubWf.setProperty("path", "/hippo:namespaces/hippostdpubwf"); // hidePubWf.getParent().orderBefore("hideHippostdpubwfNamespace", "hideHipposyseditNamespace"); + } for (NodeIterator cleanupEls = node.getNode("cms-services/htmlCleanerService/cleaner.config/hippohtmlcleaner:cleanup").getNodes("hippohtmlcleaner:cleanupElement"); cleanupEls.hasNext();) { Node element = cleanupEls.nextNode(); From helpdesk at onehippo.com Tue Mar 2 14:19:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 2 14:23:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3897) If there is custom configuration for a project, the CMS update silently fails In-Reply-To: <31230235.3086.1267191110429.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3119330.5322.1267535990687.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3897?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3897: ---------------------------------------- Fix Version/s: r2.12.06 (was: r2.12.07) patch extensively reviewed, very safe patch. > If there is custom configuration for a project, the CMS update silently fails > ----------------------------------------------------------------------------- > > Key: HREPTWO-3897 > URL: http://issues.onehippo.com/browse/HREPTWO-3897 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Berry van Halderen > Fix For: r2.12.06 > > Attachments: patch-HREPTWO-3897.txt > > > We have removed the assets tree, since we store assets as inline resources in a document type. Because the updater expects the node to be there our update process silently fails. I've attached a patch file, which is more explicit and checks for all cms frontend node if they are available. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 14:19:53 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 2 14:23:57 2010 Subject: [HippoRepos-dev] [22010] hippo-ecm: HREPTWO-3897: applied patch Message-ID: <20100302131953.A75E21C020@svn.vm.castaserver.com> Revision: 22010 Author: bvanhalderen Date: 2010-03-02 14:19:53 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3897: applied patch Modified Paths: -------------- hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java Modified: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java =================================================================== --- hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java 2010-03-02 13:19:21 UTC (rev 22009) +++ hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java 2010-03-02 13:19:53 UTC (rev 22010) @@ -197,8 +197,10 @@ context.registerVisitor(new UpdaterItemVisitor.PathVisitor("/hippo:configuration/hippo:derivatives") { @Override protected void leaving(Node node, int level) throws RepositoryException { - Node reviewedAction = node.getNode("reviewed-action/hipposys:accessed/request"); - reviewedAction.setProperty("hipposys:relPath", "../request[@hippostdpubwf:type='publish']/type"); + if(node.hasNode("reviewed-action/hipposys:accessed/request")) { + Node reviewedAction = node.getNode("reviewed-action/hipposys:accessed/request"); + reviewedAction.setProperty("hipposys:relPath", "../request[@hippostdpubwf:type='publish']/type"); + } } }); @@ -235,70 +237,102 @@ context.registerVisitor(new UpdaterItemVisitor.PathVisitor("/hippo:configuration/hippo:frontend/cms") { @Override protected void leaving(Node node, int level) throws RepositoryException { - node.getNode("cms-browser/assetsTreeLoader/cluster.config").getProperty("wicket.model").remove(); + if(node.hasNode("cms-browser/assetsTreeLoader/cluster.config")) { + node.getNode("cms-browser/assetsTreeLoader/cluster.config").getProperty("wicket.model").remove(); + } + Node browser = node.getNode("cms-browser"); - Node bp = browser.getNode("browserPerspective"); - bp.getProperty("browser.viewers").remove(); - bp.getProperty("editor.id").remove(); - bp.getProperty("extension.list").remove(); - bp.getProperty("model.document").remove(); - bp.getProperty("model.folder").remove(); - bp.getProperty("model.folder.root").remove(); + if(browser.hasNode("browserPerspective")) { + Node bp = browser.getNode("browserPerspective"); + bp.getProperty("browser.viewers").remove(); + bp.getProperty("editor.id").remove(); + bp.getProperty("extension.list").remove(); + bp.getProperty("model.document").remove(); + bp.getProperty("model.folder").remove(); + bp.getProperty("model.folder.root").remove(); + } + // TODO: convert sections to navigation sections? - browser.getNode("browserPlugin").remove(); + if(browser.hasNode("browserPlugin")) { + browser.getNode("browserPlugin").remove(); + } - Node docTreeLoaderConfig = browser.getNode("documentsTreeLoader/cluster.config"); - docTreeLoaderConfig.setProperty("wicket.model", "model.browse.collection"); - docTreeLoaderConfig.getProperty("register.context.menu").remove(); - docTreeLoaderConfig.setProperty("workflow.enabled", true); + if(browser.hasNode("documentsTreeLoader")) { + Node docTreeLoaderConfig = browser.getNode("documentsTreeLoader/cluster.config"); + docTreeLoaderConfig.setProperty("wicket.model", "model.browse.collection"); + docTreeLoaderConfig.getProperty("register.context.menu").remove(); + docTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node confTreeLoaderConfig = browser.getNode("configurationTreeLoader/cluster.config"); - confTreeLoaderConfig.getProperty("wicket.model").remove(); - confTreeLoaderConfig.getProperty("register.context.menu").remove(); - confTreeLoaderConfig.setProperty("workflow.enabled", true); + if(browser.hasNode("configurationTreeLoader")) { + Node confTreeLoaderConfig = browser.getNode("configurationTreeLoader/cluster.config"); + confTreeLoaderConfig.getProperty("wicket.model").remove(); + confTreeLoaderConfig.getProperty("register.context.menu").remove(); + confTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node imagesTreeLoaderConfig = browser.getNode("imagesTreeLoader/cluster.config"); - imagesTreeLoaderConfig.getProperty("wicket.model").remove(); - imagesTreeLoaderConfig.getProperty("register.context.menu").remove(); - imagesTreeLoaderConfig.setProperty("workflow.enabled", true); + if(browser.hasNode("imagesTreeLoader")) { + Node imagesTreeLoaderConfig = browser.getNode("imagesTreeLoader/cluster.config"); + imagesTreeLoaderConfig.getProperty("wicket.model").remove(); + imagesTreeLoaderConfig.getProperty("register.context.menu").remove(); + imagesTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node assetsTreeLoaderConfig = browser.getNode("assetsTreeLoader/cluster.config"); - assetsTreeLoaderConfig.getProperty("register.context.menu").remove(); - assetsTreeLoaderConfig.setProperty("workflow.enabled", true); - - Node nav = browser.getNode("navigator"); - nav.getProperty("extension.browser").remove(); - nav.getProperty("wicket.extensions").remove(); - nav.setProperty("browser.id", "service.browse"); - nav.setProperty("browser.viewers", "cms-folder-views"); - nav.setProperty("model.default.path", "/content/documents"); - nav.setProperty("model.document", "model.browse.document"); - nav.setProperty("model.folder", "model.browse.folder"); - nav.setProperty("search.viewers", "cms-search-views"); - nav.setProperty("section.configuration", "service.browse.tree.configuration"); - nav.setProperty("section.content", "service.browse.tree.content"); - nav.setProperty("section.files", "service.browse.tree.files"); - nav.setProperty("section.images", "service.browse.tree.images"); - nav.setProperty("sections", new String[] { "section.content", "section.images", "section.files", "section.configuration" }); - nav.setProperty("wicket.variant", "yui"); + if(browser.hasNode("assetsTreeLoader")) { + Node assetsTreeLoaderConfig = browser.getNode("assetsTreeLoader/cluster.config"); + assetsTreeLoaderConfig.getProperty("register.context.menu").remove(); + assetsTreeLoaderConfig.setProperty("workflow.enabled", true); + } - Node dashLayout = node.getNode("cms-dashboard/dashboardLayout/yui.config"); - dashLayout.setProperty("units", new String[] {"top", "left", "center", "right"}); - dashLayout.setProperty("top", "id=top,height=23px"); + if(browser.hasNode("navigator")) { + Node nav = browser.getNode("navigator"); + nav.getProperty("extension.browser").remove(); + nav.getProperty("wicket.extensions").remove(); + nav.setProperty("browser.id", "service.browse"); + nav.setProperty("browser.viewers", "cms-folder-views"); + nav.setProperty("model.default.path", "/content/documents"); + nav.setProperty("model.document", "model.browse.document"); + nav.setProperty("model.folder", "model.browse.folder"); + nav.setProperty("search.viewers", "cms-search-views"); + nav.setProperty("section.configuration", "service.browse.tree.configuration"); + nav.setProperty("section.content", "service.browse.tree.content"); + nav.setProperty("section.files", "service.browse.tree.files"); + nav.setProperty("section.images", "service.browse.tree.images"); + nav.setProperty("sections", new String[] { "section.content", "section.images", "section.files", "section.configuration" }); + nav.setProperty("wicket.variant", "yui"); + } - node.getNode("cms-editor").remove(); - node.getNode("cms-preview").remove(); - node.getNode("cms-pickers").remove(); + if(node.hasNode("cms-dashboard/dashboardLayout/yui.config")) { + Node dashLayout = node.getNode("cms-dashboard/dashboardLayout/yui.config"); + dashLayout.setProperty("units", new String[] {"top", "left", "center", "right"}); + dashLayout.setProperty("top", "id=top,height=23px"); + } + if(node.hasNode("cms-editor")) { + node.getNode("cms-editor").remove(); + } + + if(node.hasNode("cms-preview")) { + node.getNode("cms-preview").remove(); + } + + if(node.hasNode("cms-pickers")) { + node.getNode("cms-pickers").remove(); + } + // TODO: upgrade iso replace - node.getNode("cms-tree-views").remove(); + if(node.hasNode("cms-tree-views")) { + node.getNode("cms-tree-views").remove(); + } - Node hidePubWf = node.getNode("cms-folder-views/hipposysedit:namespacefolder/root/filters").addNode("hideHippostdpubwfNamespace", "frontend:pluginconfig"); - hidePubWf.setProperty("display", false); - hidePubWf.setProperty("path", "/hippo:namespaces/hippostdpubwf"); + if(node.hasNode("cms-folder-views")) { + Node hidePubWf = node.getNode("cms-folder-views/hipposysedit:namespacefolder/root/filters").addNode("hideHippostdpubwfNamespace", "frontend:pluginconfig"); + hidePubWf.setProperty("display", false); + hidePubWf.setProperty("path", "/hippo:namespaces/hippostdpubwf"); // hidePubWf.getParent().orderBefore("hideHippostdpubwfNamespace", "hideHipposyseditNamespace"); + } for (NodeIterator cleanupEls = node.getNode("cms-services/htmlCleanerService/cleaner.config/hippohtmlcleaner:cleanup").getNodes("hippohtmlcleaner:cleanupElement"); cleanupEls.hasNext();) { Node element = cleanupEls.nextNode(); From helpdesk at onehippo.com Tue Mar 2 14:21:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 2 14:25:52 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3869) StringCodecFactory issues In-Reply-To: <15176016.820.1266960110389.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <18758191.5327.1267536110479.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3869?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3869: ---------------------------------------- Fix Version/s: r2.12.07 (was: r2.12.06) > StringCodecFactory issues > ------------------------- > > Key: HREPTWO-3869 > URL: http://issues.onehippo.com/browse/HREPTWO-3869 > Project: Hippo Repository 2 > Issue Type: Improvement > Components: repository-interface > Affects Versions: r2.12.04 > Reporter: Rob van der Linden Vooren > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > Attachments: StringCodecFactory-rev21850.zip > > > StringCodecFactory was introduced to support readable urls and is currently used in core Hippo CMS Plugins. > Our project relies on this infrastructure factory in order to hook up our custom naming scheme. > In the process of implementing the custom naming scheme, I found some issues with the current implementation as mentioned below. > 1] direct use of Class.forName introduces potential class loading issues > 2] any exception that could occur loading a StringCodec class or instantiating it, are silently swallowed, returning null > 3] StringCodecs class definitions are reloaded on each 'getStringCodec(String ...)' call, introducing a performance hit > 4] 'getStringCodec()' method is unused and even when called would produce NullPointerException > 5] missing documentation > 6] missing behavior change detectors (tests) > I have addressed these issues in the patch attached (for trunk, rev 21850). > Please review. > Kind regards, > Rob van der Linden Vooren -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 14:35:07 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 2 14:39:15 2010 Subject: [HippoRepos-dev] [22011] hippo-ecm: HREPTWO-3909:prepare release Tag-HREPTWO-v2_12_06 Message-ID: <20100302133508.0FFCE1C020@svn.vm.castaserver.com> Revision: 22011 Author: bvanhalderen Date: 2010-03-02 14:35:06 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3909:prepare release Tag-HREPTWO-v2_12_06 Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06-SNAPSHOT + 2.12.06 Builtin common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06-SNAPSHOT + 2.12.06 Builtin frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend @@ -42,34 +42,34 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Builtin addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06-SNAPSHOT + 2.12.06 Builtin repository addon @@ -28,22 +28,22 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06-SNAPSHOT + 2.12.06 Builtin addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test @@ -45,25 +45,25 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test @@ -81,7 +81,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test @@ -93,109 +93,109 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-repository-upgrade - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-repository-connector - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-repository-modules - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-plugins - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-package-auth - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-package-config - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-gotolink - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06-SNAPSHOT + 2.12.06 CMS admin addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided @@ -59,13 +59,13 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-connector - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06-SNAPSHOT + 2.12.06 CMS browse addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse @@ -45,34 +45,34 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 @@ -80,13 +80,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06-SNAPSHOT + 2.12.06 CMS dashboard addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard @@ -49,44 +49,44 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06-SNAPSHOT + 2.12.06 CMS edit addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit @@ -45,50 +45,50 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 CMS addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06-SNAPSHOT + 2.12.06 CMS root addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root @@ -45,24 +45,24 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.06-SNAPSHOT + 2.12.06 Defaultcontent frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Default content addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.06-SNAPSHOT + 2.12.06 Defaultcontent repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-repository-utilities - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Eavesdrop @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop @@ -49,27 +49,27 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-frontend-plugins - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-connector - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM editor common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM editor frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend @@ -47,41 +47,41 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Editor addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-editor - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM editor repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository @@ -42,22 +42,22 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-utilities - 2.12.06-SNAPSHOT + 2.12.06 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM editor test addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test @@ -50,60 +50,60 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.06-SNAPSHOT + 2.12.06 Faceted date frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Faceted date addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.06-SNAPSHOT + 2.12.06 Faceted date repository addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided @@ -61,19 +61,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.06-SNAPSHOT + 2.12.06 Gallery common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.06-SNAPSHOT + 2.12.06 Gallery frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend @@ -42,39 +42,39 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Gallery Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.06-SNAPSHOT + 2.12.06 Gallery Addon @@ -28,21 +28,21 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06-SNAPSHOT + 2.12.06 javax.jcr Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Goto frontend addon @@ -27,16 +27,16 @@ hippo-ecm-addon-gotolink - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided @@ -47,7 +47,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Ldap Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-ldap - 2.12.06-SNAPSHOT + 2.12.06 Ldap Addon Repository @@ -35,13 +35,13 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 provided @@ -53,9 +53,9 @@ - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Addons @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.06-SNAPSHOT + 2.12.06 Reporting frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend @@ -42,13 +42,13 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Reporting addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.06-SNAPSHOT + 2.12.06 Reporting repository addon @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06-SNAPSHOT + 2.12.06 Reviewed action common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common @@ -42,12 +42,12 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06-SNAPSHOT + 2.12.06 Reviewed action frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend @@ -42,44 +42,44 @@ org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Reviewed action addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06-SNAPSHOT + 2.12.06 Reviewed action repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06-SNAPSHOT + 2.12.06 Reviewed action addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test @@ -51,49 +51,49 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-package-auth - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 test @@ -104,7 +104,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06-SNAPSHOT + 2.12.06 Sample common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06-SNAPSHOT + 2.12.06 Sample frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-sample-common - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Sample addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06-SNAPSHOT + 2.12.06 Sample repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository @@ -43,17 +43,17 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-connector - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-sample-common - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06-SNAPSHOT + 2.12.06 Sample addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test @@ -51,31 +51,31 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-sample-common - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-sample-frontend - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-sample-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-search - 2.12.06-SNAPSHOT + 2.12.06 Search frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Search Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-standards - 2.12.06-SNAPSHOT + 2.12.06 Standards frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided @@ -60,13 +60,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Standards addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Versioning frontend addon @@ -27,9 +27,9 @@ hippo-ecm-addon-versioning - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning @@ -41,30 +41,30 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Workflow @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow @@ -49,26 +49,26 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 jar provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Xinha addon @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 Xinha addon frontend plugin @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend @@ -45,19 +45,19 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 hippo @@ -73,20 +73,20 @@ org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06-SNAPSHOT + 2.12.06 YUI frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 API @@ -27,9 +27,9 @@ hippo-ecm-api - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-archetypes - 2.12.06-SNAPSHOT + 2.12.06 Addon archetype @@ -28,9 +28,9 @@ maven-archetype - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Archetypes @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06-SNAPSHOT + 2.12.06 Minimal frontend app @@ -28,21 +28,21 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-frontend-plugins - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06-SNAPSHOT + 2.12.06 Frontend engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine @@ -58,19 +58,19 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-repository-connector - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.apache.wicket Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06-SNAPSHOT + 2.12.06 Frontend plugins @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins @@ -50,22 +50,22 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-tools-projectexport - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-yui - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Frontend @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06-SNAPSHOT + 2.12.06 Frontend engine test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided @@ -53,19 +53,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM authorisation configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM package configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM EAR package @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06-SNAPSHOT + 2.12.06 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06-SNAPSHOT + 2.12.06 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-frontend-application - 2.12.06-SNAPSHOT + 2.12.06 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM CMS layout @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM package @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package - https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package + https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM package skin @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM package test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test @@ -48,34 +48,34 @@ org.hippoecm hippo-ecm-package-war - 2.12.06-SNAPSHOT + 2.12.06 war test org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-package-ear - 2.12.06-SNAPSHOT + 2.12.06 ear test org.hippoecm hippo-ecm-quickstart-ear - 2.12.06-SNAPSHOT + 2.12.06 ear test org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM WAR package @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06-SNAPSHOT + 2.12.06 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06-SNAPSHOT + 2.12.06 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-frontend-application - 2.12.06-SNAPSHOT + 2.12.06 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -17,7 +17,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM The core of Hippo ECM, i.e. repository 2, plus an advanced webbased userinterface for content management: CMS, @@ -92,9 +92,9 @@ This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html --> - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM BIN quickstart @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin org.hippoecm hippo-ecm-quickstart-war - 2.12.06-SNAPSHOT + 2.12.06 war Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM EAR quickstart @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06-SNAPSHOT + 2.12.06 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06-SNAPSHOT + 2.12.06 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-frontend-application - 2.12.06-SNAPSHOT + 2.12.06 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -285,7 +285,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06-SNAPSHOT + 2.12.06 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM quickstart @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart - https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart + https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.06-SNAPSHOT + 2.12.06 Hippo ECM WAR quickstart @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06-SNAPSHOT + 2.12.06 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06-SNAPSHOT + 2.12.06 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06-SNAPSHOT + 2.12.06 war org.hippoecm hippo-ecm-frontend-application - 2.12.06-SNAPSHOT + 2.12.06 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -285,13 +285,13 @@ org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.06-SNAPSHOT + 2.12.06 jar org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06-SNAPSHOT + 2.12.06 jar @@ -346,19 +346,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Minimal repository app @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application @@ -46,17 +46,17 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-upgrade - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 commons-lang @@ -72,7 +72,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Repository connector @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector @@ -53,7 +53,7 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.slf4j @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Repository engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine @@ -69,22 +69,22 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-connector - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-modules - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-utilities - 2.12.06-SNAPSHOT + 2.12.06 org.apache.lucene @@ -99,7 +99,7 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 @@ -112,7 +112,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Repository JCA @@ -27,9 +27,9 @@ hippo-ecm-repository-jca rar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca package @@ -153,182 +153,182 @@ org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-package-auth - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-package-config - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-versioning - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-gotolink - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-editor-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-cms-root - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-workflow - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-frontend-plugins - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Repository modules @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules @@ -51,12 +51,12 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-utilities - 2.12.06-SNAPSHOT + 2.12.06 org.slf4j Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Repository @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Repository test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test @@ -45,14 +45,14 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test @@ -76,13 +76,13 @@ org.hippoecm hippo-ecm-addon-builtin-repository test - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 test @@ -126,13 +126,13 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-addon-builtin-test - 2.12.06-SNAPSHOT + 2.12.06 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Repository upgrade module @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-repository-utilities - 2.12.06-SNAPSHOT + 2.12.06 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06-SNAPSHOT + 2.12.06 Repository Generic JCR Utilities @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content @@ -45,48 +45,48 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-frontend-plugins - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06-SNAPSHOT + 2.12.06 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06-SNAPSHOT + 2.12.06 hippo-ecm-tools-eclipse @@ -36,9 +36,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06-SNAPSHOT + 2.12.06 Tools @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm @@ -28,52 +28,52 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-package-config - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06-SNAPSHOT + 2.12.06 test org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 provided org.hippoecm hippo-ecm-tools-testutils - 2.12.06-SNAPSHOT + 2.12.06 test @@ -90,22 +90,22 @@ org.hippoecm hippo-ecm-api - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-frontend-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-engine - 2.12.06-SNAPSHOT + 2.12.06 org.hippoecm hippo-ecm-repository-utilities - 2.12.06-SNAPSHOT + 2.12.06 com.atomikos Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-02 13:19:53 UTC (rev 22010) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-02 13:35:06 UTC (rev 22011) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06-SNAPSHOT + 2.12.06 Test utilities @@ -29,9 +29,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils From svn-logs at hippocms.org Tue Mar 2 14:57:52 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 2 15:01:55 2010 Subject: [HippoRepos-dev] [22012] hippo-ecm/tags/Tag-HREPTWO-v2_12_06/: HREPTWO-3909: copy for tag Tag-HREPTWO-v2_12_06 Message-ID: <20100302135752.1DAAF1C020@svn.vm.castaserver.com> Revision: 22012 Author: bvanhalderen Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3909: copy for tag Tag-HREPTWO-v2_12_06 Added Paths: ----------- hippo-ecm/tags/Tag-HREPTWO-v2_12_06/ Property changes on: hippo-ecm/tags/Tag-HREPTWO-v2_12_06 ___________________________________________________________________ Added: svn:ignore + *.tmp .classpath .project .settings local.properties nbproject target jpox.log Added: svn:mergeinfo + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 From svn-logs at hippocms.org Tue Mar 2 14:58:04 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 2 15:02:14 2010 Subject: [HippoRepos-dev] [22013] hippo-ecm: HREPTWO-3909:prepare for next development iteration Message-ID: <20100302135805.2B5861C020@svn.vm.castaserver.com> Revision: 22013 Author: bvanhalderen Date: 2010-03-02 14:58:03 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3909:prepare for next development iteration Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06 + 2.12.07-SNAPSHOT Builtin common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06 + 2.12.07-SNAPSHOT Builtin frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend @@ -42,34 +42,34 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Builtin addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06 + 2.12.07-SNAPSHOT Builtin repository addon @@ -28,22 +28,22 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.06 + 2.12.07-SNAPSHOT Builtin addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test @@ -45,25 +45,25 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test @@ -81,7 +81,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test @@ -93,109 +93,109 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-repository-upgrade - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-repository-connector - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-repository-modules - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-plugins - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-package-auth - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-package-config - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-gotolink - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06 + 2.12.07-SNAPSHOT CMS admin addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided @@ -59,13 +59,13 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06 + 2.12.07-SNAPSHOT CMS browse addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse @@ -45,34 +45,34 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT @@ -80,13 +80,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06 + 2.12.07-SNAPSHOT CMS dashboard addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard @@ -49,44 +49,44 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06 + 2.12.07-SNAPSHOT CMS edit addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit @@ -45,50 +45,50 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT CMS addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.06 + 2.12.07-SNAPSHOT CMS root addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root @@ -45,24 +45,24 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.06 + 2.12.07-SNAPSHOT Defaultcontent frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Default content addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.06 + 2.12.07-SNAPSHOT Defaultcontent repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-repository-utilities - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Eavesdrop @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop @@ -49,27 +49,27 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM editor common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM editor frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend @@ -47,41 +47,41 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Editor addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-editor - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM editor repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository @@ -42,22 +42,22 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.06 + 2.12.07-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM editor test addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test @@ -50,60 +50,60 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.06 + 2.12.07-SNAPSHOT Faceted date frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Faceted date addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.06 + 2.12.07-SNAPSHOT Faceted date repository addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided @@ -61,19 +61,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.06 + 2.12.07-SNAPSHOT Gallery common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.06 + 2.12.07-SNAPSHOT Gallery frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend @@ -42,39 +42,39 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Gallery Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.06 + 2.12.07-SNAPSHOT Gallery Addon @@ -28,21 +28,21 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06 + 2.12.07-SNAPSHOT javax.jcr Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Goto frontend addon @@ -27,16 +27,16 @@ hippo-ecm-addon-gotolink - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided @@ -47,7 +47,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Ldap Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-ldap - 2.12.06 + 2.12.07-SNAPSHOT Ldap Addon Repository @@ -35,13 +35,13 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT provided @@ -53,9 +53,9 @@ - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Addons @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.06 + 2.12.07-SNAPSHOT Reporting frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend @@ -42,13 +42,13 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Reporting addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.06 + 2.12.07-SNAPSHOT Reporting repository addon @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06 + 2.12.07-SNAPSHOT Reviewed action common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common @@ -42,12 +42,12 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06 + 2.12.07-SNAPSHOT Reviewed action frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend @@ -42,44 +42,44 @@ org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Reviewed action addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06 + 2.12.07-SNAPSHOT Reviewed action repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.06 + 2.12.07-SNAPSHOT Reviewed action addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test @@ -51,49 +51,49 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-package-auth - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT test @@ -104,7 +104,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06 + 2.12.07-SNAPSHOT Sample common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06 + 2.12.07-SNAPSHOT Sample frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-sample-common - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Sample addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06 + 2.12.07-SNAPSHOT Sample repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository @@ -43,17 +43,17 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-sample-common - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.06 + 2.12.07-SNAPSHOT Sample addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test @@ -51,31 +51,31 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-common - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-frontend - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-search - 2.12.06 + 2.12.07-SNAPSHOT Search frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Search Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-standards - 2.12.06 + 2.12.07-SNAPSHOT Standards frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided @@ -60,13 +60,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Standards addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Versioning frontend addon @@ -27,9 +27,9 @@ hippo-ecm-addon-versioning - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning @@ -41,30 +41,30 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Workflow @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow @@ -49,26 +49,26 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT jar provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Xinha addon @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT Xinha addon frontend plugin @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend @@ -45,19 +45,19 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT hippo @@ -73,20 +73,20 @@ org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.06 + 2.12.07-SNAPSHOT YUI frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT API @@ -27,9 +27,9 @@ hippo-ecm-api - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-archetypes - 2.12.06 + 2.12.07-SNAPSHOT Addon archetype @@ -28,9 +28,9 @@ maven-archetype - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Archetypes @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06 + 2.12.07-SNAPSHOT Minimal frontend app @@ -28,21 +28,21 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06 + 2.12.07-SNAPSHOT Frontend engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine @@ -58,19 +58,19 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-repository-connector - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.apache.wicket Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06 + 2.12.07-SNAPSHOT Frontend plugins @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins @@ -50,22 +50,22 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-tools-projectexport - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Frontend @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.06 + 2.12.07-SNAPSHOT Frontend engine test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided @@ -53,19 +53,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM authorisation configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM package configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM EAR package @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06 + 2.12.07-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06 + 2.12.07-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.06 + 2.12.07-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM CMS layout @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM package @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package + https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM package skin @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM package test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test @@ -48,34 +48,34 @@ org.hippoecm hippo-ecm-package-war - 2.12.06 + 2.12.07-SNAPSHOT war test org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-package-ear - 2.12.06 + 2.12.07-SNAPSHOT ear test org.hippoecm hippo-ecm-quickstart-ear - 2.12.06 + 2.12.07-SNAPSHOT ear test org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM WAR package @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06 + 2.12.07-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06 + 2.12.07-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.06 + 2.12.07-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -17,7 +17,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM The core of Hippo ECM, i.e. repository 2, plus an advanced webbased userinterface for content management: CMS, @@ -92,9 +92,9 @@ This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html --> - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM BIN quickstart @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin org.hippoecm hippo-ecm-quickstart-war - 2.12.06 + 2.12.07-SNAPSHOT war Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM EAR quickstart @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06 + 2.12.07-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06 + 2.12.07-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.06 + 2.12.07-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -285,7 +285,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06 + 2.12.07-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM quickstart @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart + https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.06 + 2.12.07-SNAPSHOT Hippo ECM WAR quickstart @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.06 + 2.12.07-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.06 + 2.12.07-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.06 + 2.12.07-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.06 + 2.12.07-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -285,13 +285,13 @@ org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.06 + 2.12.07-SNAPSHOT jar org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06 + 2.12.07-SNAPSHOT jar @@ -346,19 +346,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Minimal repository app @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application @@ -46,17 +46,17 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-upgrade - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT commons-lang @@ -72,7 +72,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Repository connector @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector @@ -53,7 +53,7 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.slf4j @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Repository engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine @@ -69,22 +69,22 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-modules - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.06 + 2.12.07-SNAPSHOT org.apache.lucene @@ -99,7 +99,7 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT @@ -112,7 +112,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Repository JCA @@ -27,9 +27,9 @@ hippo-ecm-repository-jca rar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca package @@ -153,182 +153,182 @@ org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-package-auth - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-package-config - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-versioning - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-gotolink - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-root - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-edit - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-admin - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-search-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Repository modules @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules @@ -51,12 +51,12 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.06 + 2.12.07-SNAPSHOT org.slf4j Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Repository @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Repository test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test @@ -45,14 +45,14 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test @@ -76,13 +76,13 @@ org.hippoecm hippo-ecm-addon-builtin-repository test - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT test @@ -126,13 +126,13 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-test - 2.12.06 + 2.12.07-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Repository upgrade module @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-repository-utilities - 2.12.06 + 2.12.07-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.06 + 2.12.07-SNAPSHOT Repository Generic JCR Utilities @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content @@ -45,48 +45,48 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-plugins - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-addon-cms-browse - 2.12.06 + 2.12.07-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06 + 2.12.07-SNAPSHOT hippo-ecm-tools-eclipse @@ -36,9 +36,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.06 + 2.12.07-SNAPSHOT Tools @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm @@ -28,52 +28,52 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-package-config - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.06 + 2.12.07-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT provided org.hippoecm hippo-ecm-tools-testutils - 2.12.06 + 2.12.07-SNAPSHOT test @@ -90,22 +90,22 @@ org.hippoecm hippo-ecm-api - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.06 + 2.12.07-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.06 + 2.12.07-SNAPSHOT com.atomikos Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-02 13:57:51 UTC (rev 22012) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-02 13:58:03 UTC (rev 22013) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.06 + 2.12.07-SNAPSHOT Test utilities @@ -29,9 +29,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils From helpdesk at onehippo.com Tue Mar 2 16:15:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 2 16:19:52 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3911) UpdaterEngine fails to handle same node sibblings while renaming them from a UpdaterItemVisitor.QueryVisitor In-Reply-To: <24848756.5292.1267535390517.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <20988988.5458.1267542950385.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3911?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3911: ------------------------------------ Assignee: Berry van Halderen Fix Version/s: r2.12.07 > UpdaterEngine fails to handle same node sibblings while renaming them from a UpdaterItemVisitor.QueryVisitor > ------------------------------------------------------------------------------------------------------------ > > Key: HREPTWO-3911 > URL: http://issues.onehippo.com/browse/HREPTWO-3911 > Project: Hippo Repository 2 > Issue Type: Bug > Components: migration-utilities, repository-core > Reporter: Rob van der Linden Vooren > Assignee: Berry van Halderen > Priority: Blocker > Fix For: r2.12.07 > > > In our project, we are currently working very hard to implement some updater modules that will upgrade our content from CMS 2.09.06 to 2.12.05. > We use the UpdaterItemVisitor.QueryVisitor to apply changes to nodes that match a given query. > Running the query -that finds nodes on a given path of type hippo:handle, hippostd:directory, hippostd:folder- with the repository tool, returns 440 results. > Our updatermodule that registers a UpdaterItemVisitor.QueryVisitor with the exact same query, eventually process 432 nodes successfully: > These are localized and renamed. > However, > Some nodes fail to process (exception are swallowed silently: see HREPTWO-3910 ) . It seems that a PathNotFoundException is thrown when processing nodes (hippo:handle) with same name siblings. > Our content contains nodes with the same name, such as: > hippo:handle /content/mynode > hippo:handle /content/mynode[2] > These are apparently not processed correctly when we rename them (using UpdaterContext#setName) from out of our updater. > Please help / look into this. > Kind regards, > Rob -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 2 16:17:00 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 2 16:21:03 2010 Subject: [HippoRepos-dev] [22014] hippo-ecm: HREPTWO-3912: escape special characters Message-ID: <20100302151700.C68F81C021@svn.vm.castaserver.com> Revision: 22014 Author: fvlankvelt Date: 2010-03-02 16:17:00 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3912: escape special characters Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd Added Paths: ----------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java 2010-03-02 15:17:00 UTC (rev 22014) @@ -0,0 +1,42 @@ +/* + * Copyright 2010 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.editor.plugins; + +import org.apache.wicket.model.IModel; +import org.apache.wicket.util.string.Strings; + +public class EncodedStringModel implements IModel { + private static final long serialVersionUID = 1L; + + private IModel decorated; + + public EncodedStringModel(IModel decorated) { + this.decorated = decorated; + } + + public String getObject() { + return decorated.getObject(); + } + + public void setObject(String object) { + decorated.setObject(Strings.escapeMarkup(object).toString()); + } + + public void detach() { + decorated.detach(); + } + +} Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java 2010-03-02 13:58:03 UTC (rev 22013) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java 2010-03-02 15:17:00 UTC (rev 22014) @@ -39,7 +39,8 @@ IModel valueModel = getModel(); String mode = config.getString("mode", "view"); if (ITemplateEngine.EDIT_MODE.equals(mode)) { - TextAreaWidget widget = new TextAreaWidget("value", valueModel); + IModel encodedStringModel = new EncodedStringModel(valueModel); + TextAreaWidget widget = new TextAreaWidget("value", encodedStringModel); if (config.getString("rows") != null) { widget.setRows(config.getString("rows")); } @@ -48,7 +49,7 @@ } add(widget); } else { - add(new Label("value", valueModel)); + add(new Label("value", valueModel).setEscapeModelStrings(false)); } } Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java 2010-03-02 13:58:03 UTC (rev 22013) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java 2010-03-02 15:17:00 UTC (rev 22014) @@ -16,6 +16,7 @@ package org.hippoecm.frontend.editor.plugins; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.model.IModel; import org.hippoecm.frontend.editor.ITemplateEngine; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; import org.hippoecm.frontend.model.properties.StringConverter; @@ -40,13 +41,14 @@ String mode = config.getString("mode", "view"); StringConverter stringModel = new StringConverter((JcrPropertyValueModel) getModel()); if (ITemplateEngine.EDIT_MODE.equals(mode)) { - TextFieldWidget widget = new TextFieldWidget("value", stringModel); + IModel encodedStringModel = new EncodedStringModel(stringModel); + TextFieldWidget widget = new TextFieldWidget("value", encodedStringModel); if (config.getString("size") != null) { widget.setSize(config.getString("size")); } add(widget); } else { - add(new Label("value", stringModel)); + add(new Label("value", stringModel).setEscapeModelStrings(false)); } } Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java 2010-03-02 13:58:03 UTC (rev 22013) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java 2010-03-02 15:17:00 UTC (rev 22014) @@ -23,9 +23,7 @@ import org.apache.wicket.IClusterable; import org.cyberneko.html.parsers.SAXParser; -import org.hippoecm.frontend.validation.ModelPath; import org.hippoecm.frontend.validation.ValidationException; -import org.hippoecm.frontend.validation.Violation; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-02 13:58:03 UTC (rev 22013) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-02 15:17:00 UTC (rev 22014) @@ -18,6 +18,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import java.util.regex.Pattern; import javax.jcr.RepositoryException; @@ -46,8 +47,11 @@ static final Logger log = LoggerFactory.getLogger(JcrFieldValidator.class); + static final Pattern INVALID_CHARS = Pattern.compile(".*[<>&\"'].*"); + public static final String REQUIRED_FIELD_NOT_PRESENT = "required-field-not-present"; public static final String STRING_VALUE_IS_EMPTY = "string-value-is-empty"; + public static final String INVALID_CHARACTER = "invalid-character"; private IFieldDescriptor field; private ITypeDescriptor fieldType; @@ -86,9 +90,10 @@ } Set violations = new HashSet(); Set validators = field.getValidators(); + boolean escaped = validators.contains("escaped"); boolean required = validators.contains("required"); boolean nonEmpty = validators.contains("non-empty"); - if ((required || fieldType.isNode() || nonEmpty || htmlValidator != null) && !field.isProtected()) { + if ((required || fieldType.isNode() || nonEmpty || escaped || htmlValidator != null) && !field.isProtected()) { if ("*".equals(field.getPath())) { if ((fieldType.isNode() && (required || field.getTypeDescriptor().isValidationCascaded())) || (!fieldType.isNode() && (htmlValidator != null || nonEmpty))) { @@ -117,16 +122,23 @@ addTypeViolations(violations, childModel, typeViolations); } } - } else if (htmlValidator != null || nonEmpty) { + } else { String value = (String) childModel.getObject(); if (htmlValidator != null) { for (String key : htmlValidator.validateNonEmpty(value)) { violations.add(newValueViolation(childModel, key)); } - } else if (nonEmpty) { - if ("".equals(value)) { - violations.add(newValueViolation(childModel, STRING_VALUE_IS_EMPTY)); + } else { + if (nonEmpty) { + if ("".equals(value)) { + violations.add(newValueViolation(childModel, STRING_VALUE_IS_EMPTY)); + } } + if (escaped) { + if (INVALID_CHARS.matcher(value).matches()) { + violations.add(newValueViolation(childModel, INVALID_CHARACTER)); + } + } } } } Modified: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java 2010-03-02 13:58:03 UTC (rev 22013) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java 2010-03-02 15:17:00 UTC (rev 22014) @@ -24,14 +24,11 @@ import javax.jcr.Node; -import org.hippoecm.editor.type.JcrTypeDescriptor; -import org.hippoecm.editor.type.JcrTypeLocator; import org.hippoecm.frontend.PluginTest; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.ModelReference; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugin.config.impl.JcrPluginConfig; -import org.hippoecm.frontend.validation.IValidationResult; import org.hippoecm.frontend.validation.IValidationService; import org.hippoecm.frontend.validation.ModelPath; import org.hippoecm.frontend.validation.ModelPathElement; @@ -85,7 +82,29 @@ assertEquals(2, violations.size()); } + @Test + public void testEscapedProperty() throws Exception { + start(config); + + Node content = root.getNode("test").addNode("content", "test:validator"); + content.setProperty("test:nonempty", "something"); + content.setProperty("test:mandatory", "something"); + content.setProperty("test:multiple", new String[] { "something" }); + validate(content); + + Set violations = getViolations(); + assertEquals(0, violations.size()); + + for (char c : "<>\"'&".toCharArray()) { + content.setProperty("test:escaped", "a" + c); + validate(content); + violations = getViolations(); + assertEquals(1, violations.size()); + } + } + + @Test public void testRequiredChildNode() throws Exception { start(config); Modified: hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml 2010-03-02 13:58:03 UTC (rev 22013) +++ hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml 2010-03-02 15:17:00 UTC (rev 22014) @@ -435,6 +435,20 @@ nonempty + + + hipposysedit:field + + + test:escaped + + + String + + + escaped + + hipposysedit:field Modified: hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd 2010-03-02 13:58:03 UTC (rev 22013) +++ hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd 2010-03-02 15:17:00 UTC (rev 22014) @@ -55,6 +55,7 @@ - test:optional (string) - test:nonempty (string) - test:mandatory (string) +- test:escaped (string) - test:multiple (string) multiple - test:autocreated (string) = 'auto' autocreated - test:protected (string) protected From svn-logs at hippocms.org Tue Mar 2 16:17:14 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 2 16:21:17 2010 Subject: [HippoRepos-dev] [22015] hippo-ecm: HREPTWO-3912: escape special characters Message-ID: <20100302151714.6EA1E1C020@svn.vm.castaserver.com> Revision: 22015 Author: fvlankvelt Date: 2010-03-02 16:17:14 +0100 (Tue, 02 Mar 2010) Log Message: ----------- HREPTWO-3912: escape special characters Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties 2010-03-02 15:17:00 UTC (rev 22014) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties 2010-03-02 15:17:14 UTC (rev 22015) @@ -1,5 +1,6 @@ path-is-used-multiple-times: The same path is used multiple times required-field-not-present: A required field is not present string-value-is-empty: A string value is empty +invalid-character: Invalid character present invalid-xml: XML is not valid html-is-empty: Rich text field is empty Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties 2010-03-02 15:17:00 UTC (rev 22014) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties 2010-03-02 15:17:14 UTC (rev 22015) @@ -1,5 +1,6 @@ path-is-used-multiple-times: Hetzelfde pad wordt meerdere keren gebruikt required-field-not-present: Een verplicht veld is niet aanwezig string-value-is-empty: Een tekst waarde is leeg +invalid-character: Ongeldig karakter aanwezig invalid-xml: XML is niet geldig html-is-empty: Uitgebreide tekst is leeg From helpdesk at onehippo.com Tue Mar 2 16:17:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Tue Mar 2 16:21:53 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3912) Escape special characters in String and Text fields Message-ID: <27570101.5464.1267543070563.JavaMail.jira@jira.vm.castaserver.com> Escape special characters in String and Text fields --------------------------------------------------- Key: HREPTWO-3912 URL: http://issues.onehippo.com/browse/HREPTWO-3912 Project: Hippo Repository 2 Issue Type: Bug Reporter: Frank van Lankvelt Assignee: Frank van Lankvelt Fix For: r2.13.00 Escape special characters <>'"& in String and Text fields to their safe HTML equivalents. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 16:44:50 2010 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Tue Mar 2 16:48:53 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3913) Check if UpdaterItemVisitor does correct check for if node is virtual or not Message-ID: <30545765.5507.1267544690496.JavaMail.jira@jira.vm.castaserver.com> Check if UpdaterItemVisitor does correct check for if node is virtual or not ---------------------------------------------------------------------------- Key: HREPTWO-3913 URL: http://issues.onehippo.com/browse/HREPTWO-3913 Project: Hippo Repository 2 Issue Type: Task Reporter: Ard Schrijvers Assignee: Berry van Halderen In UpdaterItemVisitor there is this logic: public void visit(Node node) throws RepositoryException { if(node instanceof HippoNode) { Node canonical = ((HippoNode) node).getCanonicalNode(); if(canonical == null || canonical.isSame(node)) { return; } } It seems to me, that this tries to skip virtual node. But, I think the part canonical.isSame(node) must be !canonical.isSame(node) We need to check this -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 2 16:46:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 2 16:50:53 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3913) Check if UpdaterItemVisitor does correct check for if node is virtual or not In-Reply-To: <30545765.5507.1267544690496.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <32250507.5509.1267544810390.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3913?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85370#action_85370 ] Berry van Halderen commented on HREPTWO-3913: --------------------------------------------- Note that this code should be deprecated. > Check if UpdaterItemVisitor does correct check for if node is virtual or not > ---------------------------------------------------------------------------- > > Key: HREPTWO-3913 > URL: http://issues.onehippo.com/browse/HREPTWO-3913 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Ard Schrijvers > Assignee: Berry van Halderen > > In UpdaterItemVisitor there is this logic: > public void visit(Node node) throws RepositoryException { > if(node instanceof HippoNode) { > Node canonical = ((HippoNode) node).getCanonicalNode(); > if(canonical == null || canonical.isSame(node)) { > return; > } > } > It seems to me, that this tries to skip virtual node. But, I think the part > canonical.isSame(node) > must be > !canonical.isSame(node) > We need to check this -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 11:28:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 11:44:22 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3914) Scrollbar not always shown in doc listing whilst there are more documents as shown In-Reply-To: <32803443.5835.1267612130482.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29449584.5838.1267612130528.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3914?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3914: ------------------------------------ Attachment: screenshot-1.jpg > Scrollbar not always shown in doc listing whilst there are more documents as shown > ---------------------------------------------------------------------------------- > > Key: HREPTWO-3914 > URL: http://issues.onehippo.com/browse/HREPTWO-3914 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Arthur Bogaart > Fix For: r2.12.07 > > Attachments: screenshot-1.jpg > > > the doc listing panel can be resized such that the scrollbar is invisible. See screenshot -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 11:28:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 11:44:23 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3914) Scrollbar not always shown in doc listing whilst there are more documents as shown In-Reply-To: <32803443.5835.1267612130482.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8373578.5841.1267612130590.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3914?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3914: ------------------------------------ Fix Version/s: r2.13.00 (was: r2.12.07) Consider fixing this bug as part of UI redesign and/or wide doc listing feature. > Scrollbar not always shown in doc listing whilst there are more documents as shown > ---------------------------------------------------------------------------------- > > Key: HREPTWO-3914 > URL: http://issues.onehippo.com/browse/HREPTWO-3914 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > Attachments: screenshot-1.jpg > > > the doc listing panel can be resized such that the scrollbar is invisible. See screenshot -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 11:28:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 11:44:24 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3914) Scrollbar not always shown in doc listing whilst there are more documents as shown Message-ID: <32803443.5835.1267612130482.JavaMail.jira@jira.vm.castaserver.com> Scrollbar not always shown in doc listing whilst there are more documents as shown ---------------------------------------------------------------------------------- Key: HREPTWO-3914 URL: http://issues.onehippo.com/browse/HREPTWO-3914 Project: Hippo Repository 2 Issue Type: Bug Reporter: Stephan Westen Assignee: Arthur Bogaart Fix For: r2.12.07 Attachments: screenshot-1.jpg the doc listing panel can be resized such that the scrollbar is invisible. See screenshot -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 11:28:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 11:44:25 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3914) Scrollbar not always shown in doc listing whilst there are more documents as shown In-Reply-To: <32803443.5835.1267612130482.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <25763063.5844.1267612130635.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3914?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3914: ------------------------------------ Priority: Low (was: Normal) > Scrollbar not always shown in doc listing whilst there are more documents as shown > ---------------------------------------------------------------------------------- > > Key: HREPTWO-3914 > URL: http://issues.onehippo.com/browse/HREPTWO-3914 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Arthur Bogaart > Priority: Low > Fix For: r2.13.00 > > Attachments: screenshot-1.jpg > > > the doc listing panel can be resized such that the scrollbar is invisible. See screenshot -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 12:43:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 3 12:56:18 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3915) ReferentialIntegrityException if one edits a document while a scheduled request for publication made by an author is pending Message-ID: <30730774.5902.1267616630381.JavaMail.jira@jira.vm.castaserver.com> ReferentialIntegrityException if one edits a document while a scheduled request for publication made by an author is pending ---------------------------------------------------------------------------------------------------------------------------- Key: HREPTWO-3915 URL: http://issues.onehippo.com/browse/HREPTWO-3915 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 Repository Root: http://svn.hippocms.org/repos/hippo Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 Revision: 22024 Node Kind: directory Schedule: normal Last Changed Author: bvanhalderen Last Changed Rev: 22012 Last Changed Date: 2010-03-02 14:57:51 +0100 (di, 02 mrt 2010) Reporter: Sylvain P?lissier Priority: High Attachments: jst Raised by TB. STEPS: ------ - as author request a scheduled publication for articles > myarticle2 - logout - as admin, edit that document, then hit Save (or Done) You get an exception in the CMS: javax.jcr.ReferentialIntegrityException: 9f841802-57ed-465e-940c-2914882f9e17: the node cannot be removed because it is still being referenced. The rest, from the Tomcat console, is attached as 'jst'. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:24:50 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Wed Mar 3 14:39:41 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3908) Update from 2.09 to 2.12 fails for some template fields In-Reply-To: <17574753.5181.1267528910345.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <15032737.5968.1267622690461.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3908?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jeroen Reijn updated HREPTWO-3908: ---------------------------------- Attachment: department-after-upgrade.xml department-before-upgrade.xml > Update from 2.09 to 2.12 fails for some template fields > ------------------------------------------------------- > > Key: HREPTWO-3908 > URL: http://issues.onehippo.com/browse/HREPTWO-3908 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Attachments: department-after-upgrade.xml, department-before-upgrade.xml, incorrect-converted-types.png > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:32:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 14:46:07 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3916) Default two column lay-out in Quickstart In-Reply-To: <10808119.5977.1267623170426.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22645509.5980.1267623170475.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3916?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3916: ------------------------------------ Issue Type: Improvement (was: Bug) > Default two column lay-out in Quickstart > ---------------------------------------- > > Key: HREPTWO-3916 > URL: http://issues.onehippo.com/browse/HREPTWO-3916 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Stephan Westen > Assignee: Arthur Bogaart > Priority: High > Fix For: r2.13.00 > > > Today we have a one column lay-out whilst most projects use two columns. We should switch to two columns to improve testing. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:32:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 14:46:08 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3916) Default two column lay-out in Quickstart Message-ID: <10808119.5977.1267623170426.JavaMail.jira@jira.vm.castaserver.com> Default two column lay-out in Quickstart ---------------------------------------- Key: HREPTWO-3916 URL: http://issues.onehippo.com/browse/HREPTWO-3916 Project: Hippo Repository 2 Issue Type: Bug Reporter: Stephan Westen Assignee: Arthur Bogaart Priority: High Fix For: r2.13.00 Today we have a one column lay-out whilst most projects use two columns. We should switch to two columns to improve testing. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:32:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 3 14:46:09 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3917) SectionTreePlugin shows only browsed folders Message-ID: <8229280.5981.1267623170489.JavaMail.jira@jira.vm.castaserver.com> SectionTreePlugin shows only browsed folders -------------------------------------------- Key: HREPTWO-3917 URL: http://issues.onehippo.com/browse/HREPTWO-3917 Project: Hippo Repository 2 Issue Type: Bug Reporter: Berry van Halderen When browsing using the DocumentListingPlugin, the SectionTreePlugin follows the browsed path, but only displays the path actually browsed. It does not show other folders at the same level as if you would have browsed by clicking the same path in the SectionTreePlugin -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:47:50 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Wed Mar 3 14:59:03 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3918) Error while deleting document variants from attic Message-ID: <30405060.5989.1267624070665.JavaMail.jira@jira.vm.castaserver.com> Error while deleting document variants from attic ------------------------------------------------- Key: HREPTWO-3918 URL: http://issues.onehippo.com/browse/HREPTWO-3918 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Reporter: Jeroen Reijn Assignee: Berry van Halderen 03.03.2010 14:44:31 INFO [nl.rijksoverheid.importer.handler.OperationsHandler.getVariant():260] State property cannot be found for the node while obtaining a variant 03.03.2010 14:44:32 INFO [nl.rijksoverheid.importer.handler.OperationsHandler.getVariant():260] State property cannot be found for the node while obtaining a variant 03.03.2010 14:44:32 ERROR [org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.doArchive():281] error while deleting document variants from attic javax.jcr.UnsupportedRepositoryOperationException: Unable to perform a versioning operation on a non versionable node: node /content/attic/2010/3/3/address-linked-to-by-another-address/hippo:translation at org.apache.jackrabbit.core.NodeImpl.checkVersionable(NodeImpl.java:3556) at org.apache.jackrabbit.core.NodeImpl.checkin(NodeImpl.java:3277) at org.hippoecm.repository.decorating.NodeDecorator.checkin(NodeDecorator.java:379) at org.hippoecm.repository.impl.NodeDecorator.checkin(NodeDecorator.java:160) at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.doArchive(FolderWorkflowImpl.java:272) at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.archive(FolderWorkflowImpl.java:337) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) at $Proxy37.archive(Unknown Source) at org.hippoecm.repository.standardworkflow.DefaultWorkflowImpl.archive(DefaultWorkflowImpl.java:125) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationImpl.invoke(WorkflowManagerImpl.java:788) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:512) at $Proxy40.delete(Unknown Source) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305) at sun.rmi.transport.Transport$1.run(Transport.java:159) at java.security.AccessController.doPrivileged(Native Method) at sun.rmi.transport.Transport.serviceCall(Transport.java:155) at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535) at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790) at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:49:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 15:05:30 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3919) Document how to configure folder permissions Message-ID: <405402.5995.1267624190465.JavaMail.jira@jira.vm.castaserver.com> Document how to configure folder permissions --------------------------------------------- Key: HREPTWO-3919 URL: http://issues.onehippo.com/browse/HREPTWO-3919 Project: Hippo Repository 2 Issue Type: Bug Reporter: Stephan Westen Assignee: Bart van der Schans Fix For: r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:51:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 3 15:05:32 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3919) Document how to configure folder permissions In-Reply-To: <405402.5995.1267624190465.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <11391809.5998.1267624310370.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3919?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3919: ------------------------------------ Issue Type: Task (was: Bug) Priority: High (was: Normal) > Document how to configure folder permissions > --------------------------------------------- > > Key: HREPTWO-3919 > URL: http://issues.onehippo.com/browse/HREPTWO-3919 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Stephan Westen > Assignee: Bart van der Schans > Priority: High > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 14:53:50 2010 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Wed Mar 3 15:05:33 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3920) Should the default jcr node names that are created through the cms be lowercase? Message-ID: <28681147.6006.1267624430527.JavaMail.jira@jira.vm.castaserver.com> Should the default jcr node names that are created through the cms be lowercase? -------------------------------------------------------------------------------- Key: HREPTWO-3920 URL: http://issues.onehippo.com/browse/HREPTWO-3920 Project: Hippo Repository 2 Issue Type: Task Reporter: Ard Schrijvers I think in general, customers prefer lower-case urls over case sensitive urls. Should we by default, have lowercase jcr node names being added through the cms, or not? So, currently something like 'This is the CMS' becomes 'This-is-the-CMS'. Should we better have 'this-is-the-cms' as default -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 15:01:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 3 15:18:12 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3918) Error while deleting document variants from attic In-Reply-To: <30405060.5989.1267624070665.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <33117199.6039.1267624910929.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3918?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3918: ---------------------------------------- Fix Version/s: r2.12.07 r2.13.00 > Error while deleting document variants from attic > ------------------------------------------------- > > Key: HREPTWO-3918 > URL: http://issues.onehippo.com/browse/HREPTWO-3918 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jeroen Reijn > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > > 03.03.2010 14:44:31 INFO [nl.rijksoverheid.importer.handler.OperationsHandler.getVariant():260] State property cannot be found for the node while obtaining a variant > 03.03.2010 14:44:32 INFO [nl.rijksoverheid.importer.handler.OperationsHandler.getVariant():260] State property cannot be found for the node while obtaining a variant > 03.03.2010 14:44:32 ERROR [org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.doArchive():281] error while deleting document variants from attic > javax.jcr.UnsupportedRepositoryOperationException: Unable to perform a versioning operation on a non versionable node: node /content/attic/2010/3/3/address-linked-to-by-another-address/hippo:translation > at org.apache.jackrabbit.core.NodeImpl.checkVersionable(NodeImpl.java:3556) > at org.apache.jackrabbit.core.NodeImpl.checkin(NodeImpl.java:3277) > at org.hippoecm.repository.decorating.NodeDecorator.checkin(NodeDecorator.java:379) > at org.hippoecm.repository.impl.NodeDecorator.checkin(NodeDecorator.java:160) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.doArchive(FolderWorkflowImpl.java:272) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.archive(FolderWorkflowImpl.java:337) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > at $Proxy37.archive(Unknown Source) > at org.hippoecm.repository.standardworkflow.DefaultWorkflowImpl.archive(DefaultWorkflowImpl.java:125) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationImpl.invoke(WorkflowManagerImpl.java:788) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:512) > at $Proxy40.delete(Unknown Source) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305) > at sun.rmi.transport.Transport$1.run(Transport.java:159) > at java.security.AccessController.doPrivileged(Native Method) > at sun.rmi.transport.Transport.serviceCall(Transport.java:155) > at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535) > at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790) > at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649) > at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:619) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 3 15:02:20 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 3 15:18:16 2010 Subject: [HippoRepos-dev] [22026] hippo-ecm: HREPTWO-3918: guard checkin/out for hippo: translation nodes (and others non versionable nodes) Message-ID: <20100303140220.5D8AF1C020@svn.vm.castaserver.com> Revision: 22026 Author: bvanhalderen Date: 2010-03-03 15:02:19 +0100 (Wed, 03 Mar 2010) Log Message: ----------- HREPTWO-3918: guard checkin/out for hippo:translation nodes (and others non versionable nodes) Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-03 11:33:33 UTC (rev 22025) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-03 14:02:19 UTC (rev 22026) @@ -194,7 +194,7 @@ private final boolean compute(ValueFactory valueFactory, Node derivatesFolder, Node modified) throws ConstraintViolationException, RepositoryException { if(!modified.isCheckedOut()) { - modified.checkout(); + modified.checkout(); // FIXME: is this node always versionable? } SortedSet dependencies = new TreeSet(); @@ -432,7 +432,7 @@ if(values != null && values.length >= 1) { try { if(!targetModifiedNode.isCheckedOut()) { - targetModifiedNode.checkout(); + targetModifiedNode.checkout(); // FIXME: is this node always versionalble? } targetModifiedNode.setProperty(targetModifiedPropertyPath, values[0]); if(logger.isDebugEnabled()) { @@ -462,7 +462,7 @@ } try { if(!targetModifiedNode.isCheckedOut()) { - targetModifiedNode.checkout(); + targetModifiedNode.checkout(); // FIXME: is this node always versionalble? } targetModifiedNode.setProperty(targetModifiedPropertyPath, values); if(logger.isDebugEnabled()) { @@ -533,7 +533,7 @@ if(changed) { try { if(!modified.isCheckedOut()) { - modified.checkout(); + modified.checkout(); // FIXME: is this node always versionalble? } modified.setProperty(HippoNodeType.HIPPO_RELATED, dependenciesValues); } catch(ItemNotFoundException ex) { Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java 2010-03-03 11:33:33 UTC (rev 22025) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java 2010-03-03 14:02:19 UTC (rev 22026) @@ -269,7 +269,10 @@ if (target.isNodeType(HippoNodeType.NT_HANDLE) && target.hasNodes()) { target.checkout(); for (NodeIterator iter = target.getNodes(); iter.hasNext(); ) { - iter.nextNode().checkin(); + Node child = iter.nextNode(); + if (child.isNodeType(HippoNodeType.NT_DOCUMENT)) { + child.checkin(); + } } for (NodeIterator iter = target.getNodes(); iter.hasNext(); ) { iter.nextNode().remove(); From svn-logs at hippocms.org Wed Mar 3 15:03:32 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 3 15:18:19 2010 Subject: [HippoRepos-dev] [22027] hippo-ecm: HREPTWO-3918: guard checkin/out for hippo: translation nodes (and others non versionable nodes) Message-ID: <20100303140332.BAEF41C020@svn.vm.castaserver.com> Revision: 22027 Author: bvanhalderen Date: 2010-03-03 15:03:32 +0100 (Wed, 03 Mar 2010) Log Message: ----------- HREPTWO-3918: guard checkin/out for hippo:translation nodes (and others non versionable nodes) Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-03 14:02:19 UTC (rev 22026) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-03 14:03:32 UTC (rev 22027) @@ -194,7 +194,7 @@ private final boolean compute(ValueFactory valueFactory, Node derivatesFolder, Node modified) throws ConstraintViolationException, RepositoryException { if(!modified.isCheckedOut()) { - modified.checkout(); + modified.checkout(); // FIXME: is this node always versionable? } SortedSet dependencies = new TreeSet(); @@ -432,7 +432,7 @@ if(values != null && values.length >= 1) { try { if(!targetModifiedNode.isCheckedOut()) { - targetModifiedNode.checkout(); + targetModifiedNode.checkout(); // FIXME: is this node always versionalble? } targetModifiedNode.setProperty(targetModifiedPropertyPath, values[0]); if(logger.isDebugEnabled()) { @@ -462,7 +462,7 @@ } try { if(!targetModifiedNode.isCheckedOut()) { - targetModifiedNode.checkout(); + targetModifiedNode.checkout(); // FIXME: is this node always versionalble? } targetModifiedNode.setProperty(targetModifiedPropertyPath, values); if(logger.isDebugEnabled()) { @@ -533,7 +533,7 @@ if(changed) { try { if(!modified.isCheckedOut()) { - modified.checkout(); + modified.checkout(); // FIXME: is this node always versionalble? } modified.setProperty(HippoNodeType.HIPPO_RELATED, dependenciesValues); } catch(ItemNotFoundException ex) { Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java 2010-03-03 14:02:19 UTC (rev 22026) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java 2010-03-03 14:03:32 UTC (rev 22027) @@ -269,7 +269,10 @@ if (target.isNodeType(HippoNodeType.NT_HANDLE) && target.hasNodes()) { target.checkout(); for (NodeIterator iter = target.getNodes(); iter.hasNext(); ) { - iter.nextNode().checkin(); + Node child = iter.nextNode(); + if (child.isNodeType(HippoNodeType.NT_DOCUMENT)) { + child.checkin(); + } } for (NodeIterator iter = target.getNodes(); iter.hasNext(); ) { iter.nextNode().remove(); From helpdesk at onehippo.com Wed Mar 3 15:07:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 3 15:24:37 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3921) console skin not found when installing console as servlet Message-ID: <1854852.6050.1267625270320.JavaMail.jira@jira.vm.castaserver.com> console skin not found when installing console as servlet --------------------------------------------------------- Key: HREPTWO-3921 URL: http://issues.onehippo.com/browse/HREPTWO-3921 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06, r2.13.00 Reporter: Berry van Halderen -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 16:15:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 3 16:28:28 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3922) NullPointerException - Property for 'repository.not.available' not found Message-ID: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> NullPointerException - Property for 'repository.not.available' not found ------------------------------------------------------------------------ Key: HREPTWO-3922 URL: http://issues.onehippo.com/browse/HREPTWO-3922 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 Repository Root: http://svn.hippocms.org/repos/hippo Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 Revision: 22024 Node Kind: directory Schedule: normal Last Changed Author: bvanhalderen Last Changed Rev: 22012 Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) Reporter: Sylvain P?lissier Attachments: tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. The error output is attached as tomcat_serialized_session.log where the steps are marked like: ----- STEPS ----- So, in summary: 1/ SERVER STARTS 2/ 'admin' logs in, goes to the Documents, logs out 3/ SERVER STOPS 4/ SERVER STARTS (2) 5/ The browser is refreshed 6/ SERVER STOPS (2) There is a workaround: 1/ access http:// and log in to Tomcat Manager (http:///manager/html) 2/ zero the idle threshold for the Hippo CMS application 3/ click the Expire sessions button See tomcat_manager.png for an illustration. This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 16:57:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 3 17:16:00 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3923) facet sub search nodes only visible for admin Message-ID: <19510281.6166.1267631870362.JavaMail.jira@jira.vm.castaserver.com> facet sub search nodes only visible for admin --------------------------------------------- Key: HREPTWO-3923 URL: http://issues.onehippo.com/browse/HREPTWO-3923 Project: Hippo Repository 2 Issue Type: Bug Reporter: Frank van Lankvelt Assignee: Frank van Lankvelt Fix For: r2.12.07, r2.13.00 The dynamically generated child nodes under a facet search node are visible for neither author nor editor. This applies e.g. to the "state" and "tags" nodes under /content/documents. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 16:59:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 3 17:16:01 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3923) facet sub search nodes only visible for admin In-Reply-To: <19510281.6166.1267631870362.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <23583367.6168.1267631990349.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3923?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3923: ---------------------------------------- Description: The dynamically generated child nodes under a facet search node are visible for neither author nor editor. This applies e.g. to the "state" and "tags" nodes under /content/documents. What's more, the resultset is also empty (no child nodes, count == 0). was:The dynamically generated child nodes under a facet search node are visible for neither author nor editor. This applies e.g. to the "state" and "tags" nodes under /content/documents. > facet sub search nodes only visible for admin > --------------------------------------------- > > Key: HREPTWO-3923 > URL: http://issues.onehippo.com/browse/HREPTWO-3923 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > Fix For: r2.12.07, r2.13.00 > > > The dynamically generated child nodes under a facet search node are visible for neither author nor editor. This applies e.g. to the "state" and "tags" nodes under /content/documents. > What's more, the resultset is also empty (no child nodes, count == 0). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 17:42:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 3 17:56:09 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3922) NullPointerException - Property for 'repository.not.available' not found In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8963320.6183.1267634570439.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3922: ---------------------------------------- Assignee: Frank van Lankvelt Fix Version/s: r2.12.07 r2.13.00 > NullPointerException - Property for 'repository.not.available' not found > ------------------------------------------------------------------------ > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.12.07, r2.13.00 > > Attachments: tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 3 17:55:19 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 3 18:13:10 2010 Subject: [HippoRepos-dev] [22028] hippo-ecm: HREPTWO-3922: check whether session model exists before detaching it Message-ID: <20100303165519.5F0D91C020@svn.vm.castaserver.com> Revision: 22028 Author: fvlankvelt Date: 2010-03-03 17:55:19 +0100 (Wed, 03 Mar 2010) Log Message: ----------- HREPTWO-3922: check whether session model exists before detaching it Modified Paths: -------------- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/session/UserSession.java Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/session/UserSession.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/session/UserSession.java 2010-03-03 14:03:32 UTC (rev 22027) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/session/UserSession.java 2010-03-03 16:55:19 UTC (rev 22028) @@ -170,7 +170,10 @@ * model will take care of saving any pending changes. */ public void releaseJcrSession() { - getJcrSessionModel().detach(); + IModel sessionModel = getJcrSessionModel(); + if (sessionModel != null) { + getJcrSessionModel().detach(); + } classLoader.detach(); workflowManager.detach(); facetSearchObserver = null; From helpdesk at onehippo.com Wed Mar 3 18:12:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 3 18:30:11 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3922) NullPointerException - Property for 'repository.not.available' not found In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <25326206.6217.1267636370541.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3922: --------------------------------------- Attachment: persistent_session.log > NullPointerException - Property for 'repository.not.available' not found > ------------------------------------------------------------------------ > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.12.07, r2.13.00 > > Attachments: persistent_session.log, tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 3 18:12:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 3 18:30:12 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3922) NullPointerException - Property for 'repository.not.available' not found In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2156154.6214.1267636370481.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85521#action_85521 ] Sylvain P?lissier commented on HREPTWO-3922: -------------------------------------------- Restarting the server once more without using the workaround seems to add more debug information such as 'Exception loading sessions from persistent storage'. Please, find the log attached as persistent_session.log > NullPointerException - Property for 'repository.not.available' not found > ------------------------------------------------------------------------ > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.12.07, r2.13.00 > > Attachments: persistent_session.log, tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:14:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 11:42:22 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3910) UpdaterEngine swallows exceptions In-Reply-To: <27830376.5266.1267534670728.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <6272741.6347.1267697690459.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3910?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3910: ------------------------------------ Assignee: Berry van Halderen Fix Version/s: r2.12.07 r2.13.00 > UpdaterEngine swallows exceptions > --------------------------------- > > Key: HREPTWO-3910 > URL: http://issues.onehippo.com/browse/HREPTWO-3910 > Project: Hippo Repository 2 > Issue Type: Bug > Components: migration-utilities, repository-core > Reporter: Rob van der Linden Vooren > Assignee: Berry van Halderen > Priority: Blocker > Fix For: r2.12.07, r2.13.00 > > > Hi, > In our project, we are currently working very hard to implement some updater modules that will upgrade our content from CMS 2.09.06 to 2.12.05. > We use the UpdaterItemVisitor.QueryVisitor to apply changes to nodes that match a given query. > Running the query -that finds nodes on a given path of type hippo:handle, hippostd:directory, hippostd:folder- with the repository tool, returns 440 results. > Our updatermodule that registers a UpdaterItemVisitor.QueryVisitor with the exact same query, eventually affects 432 nodes... > Why? > After some debugging we found the following: > The UpdaterEngine, line 819-843 happily swallows exceptions such as PathNotFoundException, InvalidItemStateException, ItemNotFoundException. > Additionally, these exception are not logged. > This really does not help debugging any problems/bugs that are present, such as: HREPTWO-3911 > Please address this. > Regards, > Rob -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:21:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 11:42:26 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3869) StringCodecFactory issues In-Reply-To: <15176016.820.1266960110389.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <24700032.6366.1267698110519.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3869?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3869: ------------------------------------ Priority: High (was: Normal) > StringCodecFactory issues > ------------------------- > > Key: HREPTWO-3869 > URL: http://issues.onehippo.com/browse/HREPTWO-3869 > Project: Hippo Repository 2 > Issue Type: Improvement > Components: repository-interface > Affects Versions: r2.12.04 > Reporter: Rob van der Linden Vooren > Assignee: Berry van Halderen > Priority: High > Fix For: r2.12.07, r2.13.00 > > Attachments: StringCodecFactory-rev21850.zip > > > StringCodecFactory was introduced to support readable urls and is currently used in core Hippo CMS Plugins. > Our project relies on this infrastructure factory in order to hook up our custom naming scheme. > In the process of implementing the custom naming scheme, I found some issues with the current implementation as mentioned below. > 1] direct use of Class.forName introduces potential class loading issues > 2] any exception that could occur loading a StringCodec class or instantiating it, are silently swallowed, returning null > 3] StringCodecs class definitions are reloaded on each 'getStringCodec(String ...)' call, introducing a performance hit > 4] 'getStringCodec()' method is unused and even when called would produce NullPointerException > 5] missing documentation > 6] missing behavior change detectors (tests) > I have addressed these issues in the patch attached (for trunk, rev 21850). > Please review. > Kind regards, > Rob van der Linden Vooren -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:28:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 11:44:10 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3922) NullPointerException - Property for 'repository.not.available' not found In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29467818.6377.1267698530713.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85542#action_85542 ] Stephan Westen commented on HREPTWO-3922: ----------------------------------------- See http://www.onehippo.org/cms7/documentation/installation/.help_startup_servlet_container.html for issues related to persistent storage. Improve the documentation on http://www.onehippo.org/cms7/documentation/installation/in_servlet_container.html, step 3. This issue is raised now too many times that we need to include instructions to turn persistence of on the main instruction page. > NullPointerException - Property for 'repository.not.available' not found > ------------------------------------------------------------------------ > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.12.07, r2.13.00 > > Attachments: persistent_session.log, tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:30:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 11:51:26 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3922) NullPointerException - Property for 'repository.not.available' not found In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22204975.6388.1267698650930.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3922: ------------------------------------ Fix Version/s: (was: r2.12.07) > NullPointerException - Property for 'repository.not.available' not found > ------------------------------------------------------------------------ > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: persistent_session.log, tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:36:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 11:51:41 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3924) Fix remaining issues with Pretty URLs Message-ID: <6740182.6424.1267699010743.JavaMail.jira@jira.vm.castaserver.com> Fix remaining issues with Pretty URLs ------------------------------------- Key: HREPTWO-3924 URL: http://issues.onehippo.com/browse/HREPTWO-3924 Project: Hippo Repository 2 Issue Type: Bug Reporter: Stephan Westen Assignee: Berry van Halderen Fix For: r2.13.00 - the set of characters that is allowed differs between implementation and (intended) specification - consider converting to lower case -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:42:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 11:51:58 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3912) Escape special characters in String and Text fields In-Reply-To: <27570101.5464.1267543070563.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <20849286.6434.1267699370481.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3912?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3912: ------------------------------------ Description: For security reasons escape special characters <>'"& in String and Text fields to their safe HTML equivalents. (was: Escape special characters <>'"& in String and Text fields to their safe HTML equivalents.) > Escape special characters in String and Text fields > --------------------------------------------------- > > Key: HREPTWO-3912 > URL: http://issues.onehippo.com/browse/HREPTWO-3912 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > For security reasons escape special characters <>'"& in String and Text fields to their safe HTML equivalents. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:42:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Thu Mar 4 11:52:01 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3912) Escape special characters in String and Text fields In-Reply-To: <27570101.5464.1267543070563.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <12938524.6441.1267699370587.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3912?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3912: ---------------------------------------- Fix Version/s: r2.12.07 > Escape special characters in String and Text fields > --------------------------------------------------- > > Key: HREPTWO-3912 > URL: http://issues.onehippo.com/browse/HREPTWO-3912 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > Fix For: r2.12.07, r2.13.00 > > > For security reasons escape special characters <>'"& in String and Text fields to their safe HTML equivalents. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 11:44:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 11:52:04 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26262517.6444.1267699490408.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85553#action_85553 ] Stephan Westen commented on HREPTWO-3651: ----------------------------------------- My understanding is that Xinha by default removes > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:00:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:05:11 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3925) Block systemuser accounts from logging into CMS In-Reply-To: <20047413.6456.1267700450474.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <28778263.6459.1267700450517.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3925?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3925: ------------------------------------ Issue Type: New Feature (was: Bug) Priority: High (was: Normal) > Block systemuser accounts from logging into CMS > ----------------------------------------------- > > Key: HREPTWO-3925 > URL: http://issues.onehippo.com/browse/HREPTWO-3925 > Project: Hippo Repository 2 > Issue Type: New Feature > Reporter: Stephan Westen > Assignee: Bart van der Schans > Priority: High > Fix For: r2.13.00 > > > Use case: > An importscript logs in as a system user. This user should be denied access into the CMS. > Based on RDMP-143. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:00:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:05:18 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3925) Block systemuser accounts from logging into CMS Message-ID: <20047413.6456.1267700450474.JavaMail.jira@jira.vm.castaserver.com> Block systemuser accounts from logging into CMS ----------------------------------------------- Key: HREPTWO-3925 URL: http://issues.onehippo.com/browse/HREPTWO-3925 Project: Hippo Repository 2 Issue Type: Bug Reporter: Stephan Westen Assignee: Bart van der Schans Fix For: r2.13.00 Use case: An importscript logs in as a system user. This user should be denied access into the CMS. Based on RDMP-143. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:08:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:13:04 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3926) Preview button in CMS Message-ID: <28117609.6472.1267700930493.JavaMail.jira@jira.vm.castaserver.com> Preview button in CMS --------------------- Key: HREPTWO-3926 URL: http://issues.onehippo.com/browse/HREPTWO-3926 Project: Hippo Repository 2 Issue Type: New Feature Reporter: Stephan Westen Assignee: Arthur Bogaart Priority: Top Fix For: r2.13.00 *Must* be finished within March -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:10:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:15:22 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3927) Compare two document versions Message-ID: <23991122.6484.1267701050452.JavaMail.jira@jira.vm.castaserver.com> Compare two document versions ----------------------------- Key: HREPTWO-3927 URL: http://issues.onehippo.com/browse/HREPTWO-3927 Project: Hippo Repository 2 Issue Type: New Feature Reporter: Stephan Westen Assignee: Frank van Lankvelt Priority: High Fix For: r2.13.00 Extend the version history so you can select two versions and compare them. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:16:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:21:07 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3928) Improve interaction when deleting folder In-Reply-To: <1761612.6494.1267701290367.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <24180101.6501.1267701410818.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3928?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3928: ------------------------------------ Issue Type: Improvement (was: New Feature) > Improve interaction when deleting folder > ---------------------------------------- > > Key: HREPTWO-3928 > URL: http://issues.onehippo.com/browse/HREPTWO-3928 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Stephan Westen > Assignee: Arthur Bogaart > Priority: High > Fix For: r2.13.00 > > Original Estimate: 2 days > Remaining Estimate: 2 days > > Short term fix: > - no one can delete a folder if it is not empty > - admin can delete from the console -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:16:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:21:08 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3929) Document MS Word and Excel importer Message-ID: <26539069.6507.1267701410908.JavaMail.jira@jira.vm.castaserver.com> Document MS Word and Excel importer ------------------------------------ Key: HREPTWO-3929 URL: http://issues.onehippo.com/browse/HREPTWO-3929 Project: Hippo Repository 2 Issue Type: Task Reporter: Stephan Westen Assignee: Arthur Bogaart Fix For: r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:20:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:25:01 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3930) Versioning: improve revision history information Message-ID: <23041590.6518.1267701650474.JavaMail.jira@jira.vm.castaserver.com> Versioning: improve revision history information ------------------------------------------------ Key: HREPTWO-3930 URL: http://issues.onehippo.com/browse/HREPTWO-3930 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Stephan Westen Assignee: Frank van Lankvelt Fix For: r2.13.00 Show in the revision history information like: - Who published the document? - When was the initial draft created, and by whom? (this revision can't be rolled back - it's only there to provide some background information) - Who 'owns' the current version (which has not been published) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 12:14:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 12:42:32 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3928) Improve interaction when deleting folder Message-ID: <1761612.6494.1267701290367.JavaMail.jira@jira.vm.castaserver.com> Improve interaction when deleting folder ---------------------------------------- Key: HREPTWO-3928 URL: http://issues.onehippo.com/browse/HREPTWO-3928 Project: Hippo Repository 2 Issue Type: New Feature Reporter: Stephan Westen Assignee: Arthur Bogaart Priority: High Fix For: r2.13.00 Short term fix: - no one can delete a folder if it is not empty - admin can delete from the console -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 13:02:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Thu Mar 4 13:07:01 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3922) Serializable sessions in tomcat In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <5407591.6571.1267704170455.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3922: ---------------------------------------- Summary: Serializable sessions in tomcat (was: NullPointerException - Property for 'repository.not.available' not found) Issue Type: Improvement (was: Bug) Description: When tomcat shuts down, by default it will serialize sessions to disk and deserialize them when it is restarted. This can be disabled, as has been documented, but it would be better if this simply wasn't necessary. ====== Original problem ===== There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. The error output is attached as tomcat_serialized_session.log where the steps are marked like: ----- STEPS ----- So, in summary: 1/ SERVER STARTS 2/ 'admin' logs in, goes to the Documents, logs out 3/ SERVER STOPS 4/ SERVER STARTS (2) 5/ The browser is refreshed 6/ SERVER STOPS (2) There is a workaround: 1/ access http:// and log in to Tomcat Manager (http:///manager/html) 2/ zero the idle threshold for the Hippo CMS application 3/ click the Expire sessions button See tomcat_manager.png for an illustration. This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. was: There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. The error output is attached as tomcat_serialized_session.log where the steps are marked like: ----- STEPS ----- So, in summary: 1/ SERVER STARTS 2/ 'admin' logs in, goes to the Documents, logs out 3/ SERVER STOPS 4/ SERVER STARTS (2) 5/ The browser is refreshed 6/ SERVER STOPS (2) There is a workaround: 1/ access http:// and log in to Tomcat Manager (http:///manager/html) 2/ zero the idle threshold for the Hippo CMS application 3/ click the Expire sessions button See tomcat_manager.png for an illustration. This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. Some of the issues are related to (de)serialization and cleanup of the wicket session, so might be triggered under other conditions as well. > Serializable sessions in tomcat > ------------------------------- > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: persistent_session.log, tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > When tomcat shuts down, by default it will serialize sessions to disk and deserialize them when it is restarted. This can be disabled, as has been documented, but it would be better if this simply wasn't necessary. > ====== Original problem ===== > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 4 14:12:24 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 4 14:16:42 2010 Subject: [HippoRepos-dev] [22029] hippo-ecm: HREPTWO-3912: backport Message-ID: <20100304131224.38F1D1C020@svn.vm.castaserver.com> Revision: 22029 Author: fvlankvelt Date: 2010-03-04 14:12:23 +0100 (Thu, 04 Mar 2010) Log Message: ----------- HREPTWO-3912: backport Escape special characters for String and Text fields. Use the "escape" validator to enforce this in the template editor. Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd Added Paths: ----------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Copied: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java (from rev 22014, hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java) =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java 2010-03-04 13:12:23 UTC (rev 22029) @@ -0,0 +1,42 @@ +/* + * Copyright 2010 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.editor.plugins; + +import org.apache.wicket.model.IModel; +import org.apache.wicket.util.string.Strings; + +public class EncodedStringModel implements IModel { + private static final long serialVersionUID = 1L; + + private IModel decorated; + + public EncodedStringModel(IModel decorated) { + this.decorated = decorated; + } + + public String getObject() { + return decorated.getObject(); + } + + public void setObject(String object) { + decorated.setObject(Strings.escapeMarkup(object).toString()); + } + + public void detach() { + decorated.detach(); + } + +} Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java 2010-03-04 13:12:23 UTC (rev 22029) @@ -39,7 +39,8 @@ IModel valueModel = getModel(); String mode = config.getString("mode", "view"); if (ITemplateEngine.EDIT_MODE.equals(mode)) { - TextAreaWidget widget = new TextAreaWidget("value", valueModel); + IModel encodedStringModel = new EncodedStringModel(valueModel); + TextAreaWidget widget = new TextAreaWidget("value", encodedStringModel); if (config.getString("rows") != null) { widget.setRows(config.getString("rows")); } @@ -48,7 +49,7 @@ } add(widget); } else { - add(new Label("value", valueModel)); + add(new Label("value", valueModel).setEscapeModelStrings(false)); } } Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java 2010-03-04 13:12:23 UTC (rev 22029) @@ -16,6 +16,7 @@ package org.hippoecm.frontend.editor.plugins; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.model.IModel; import org.hippoecm.frontend.editor.ITemplateEngine; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; import org.hippoecm.frontend.model.properties.StringConverter; @@ -40,13 +41,14 @@ String mode = config.getString("mode", "view"); StringConverter stringModel = new StringConverter((JcrPropertyValueModel) getModel()); if (ITemplateEngine.EDIT_MODE.equals(mode)) { - TextFieldWidget widget = new TextFieldWidget("value", stringModel); + IModel encodedStringModel = new EncodedStringModel(stringModel); + TextFieldWidget widget = new TextFieldWidget("value", encodedStringModel); if (config.getString("size") != null) { widget.setSize(config.getString("size")); } add(widget); } else { - add(new Label("value", stringModel)); + add(new Label("value", stringModel).setEscapeModelStrings(false)); } } Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/HtmlValidator.java 2010-03-04 13:12:23 UTC (rev 22029) @@ -23,9 +23,7 @@ import org.apache.wicket.IClusterable; import org.cyberneko.html.parsers.SAXParser; -import org.hippoecm.frontend.validation.ModelPath; import org.hippoecm.frontend.validation.ValidationException; -import org.hippoecm.frontend.validation.Violation; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-04 13:12:23 UTC (rev 22029) @@ -18,6 +18,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import java.util.regex.Pattern; import javax.jcr.RepositoryException; @@ -46,8 +47,11 @@ static final Logger log = LoggerFactory.getLogger(JcrFieldValidator.class); + static final Pattern INVALID_CHARS = Pattern.compile(".*[<>&\"'].*"); + public static final String REQUIRED_FIELD_NOT_PRESENT = "required-field-not-present"; public static final String STRING_VALUE_IS_EMPTY = "string-value-is-empty"; + public static final String INVALID_CHARACTER = "invalid-character"; private IFieldDescriptor field; private ITypeDescriptor fieldType; @@ -86,9 +90,10 @@ } Set violations = new HashSet(); Set validators = field.getValidators(); + boolean escaped = validators.contains("escaped"); boolean required = validators.contains("required"); boolean nonEmpty = validators.contains("non-empty"); - if ((required || fieldType.isNode() || nonEmpty || htmlValidator != null) && !field.isProtected()) { + if ((required || fieldType.isNode() || nonEmpty || escaped || htmlValidator != null) && !field.isProtected()) { if ("*".equals(field.getPath())) { if ((fieldType.isNode() && (required || field.getTypeDescriptor().isValidationCascaded())) || (!fieldType.isNode() && (htmlValidator != null || nonEmpty))) { @@ -117,16 +122,23 @@ addTypeViolations(violations, childModel, typeViolations); } } - } else if (htmlValidator != null || nonEmpty) { + } else { String value = (String) childModel.getObject(); if (htmlValidator != null) { for (String key : htmlValidator.validateNonEmpty(value)) { violations.add(newValueViolation(childModel, key)); } - } else if (nonEmpty) { - if ("".equals(value)) { - violations.add(newValueViolation(childModel, STRING_VALUE_IS_EMPTY)); + } else { + if (nonEmpty) { + if ("".equals(value)) { + violations.add(newValueViolation(childModel, STRING_VALUE_IS_EMPTY)); + } } + if (escaped) { + if (INVALID_CHARS.matcher(value).matches()) { + violations.add(newValueViolation(childModel, INVALID_CHARACTER)); + } + } } } } Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback.properties 2010-03-04 13:12:23 UTC (rev 22029) @@ -1,5 +1,6 @@ path-is-used-multiple-times: The same path is used multiple times required-field-not-present: A required field is not present string-value-is-empty: A string value is empty +invalid-character: Invalid character present invalid-xml: XML is not valid html-is-empty: Rich text field is empty Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/ValidationFeedback_nl.properties 2010-03-04 13:12:23 UTC (rev 22029) @@ -1,5 +1,6 @@ path-is-used-multiple-times: Hetzelfde pad wordt meerdere keren gebruikt required-field-not-present: Een verplicht veld is niet aanwezig string-value-is-empty: Een tekst waarde is leeg +invalid-character: Ongeldig karakter aanwezig invalid-xml: XML is niet geldig html-is-empty: Uitgebreide tekst is leeg Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/validator/ValidationPluginTest.java 2010-03-04 13:12:23 UTC (rev 22029) @@ -24,14 +24,11 @@ import javax.jcr.Node; -import org.hippoecm.editor.type.JcrTypeDescriptor; -import org.hippoecm.editor.type.JcrTypeLocator; import org.hippoecm.frontend.PluginTest; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.ModelReference; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugin.config.impl.JcrPluginConfig; -import org.hippoecm.frontend.validation.IValidationResult; import org.hippoecm.frontend.validation.IValidationService; import org.hippoecm.frontend.validation.ModelPath; import org.hippoecm.frontend.validation.ModelPathElement; @@ -85,7 +82,29 @@ assertEquals(2, violations.size()); } + @Test + public void testEscapedProperty() throws Exception { + start(config); + + Node content = root.getNode("test").addNode("content", "test:validator"); + content.setProperty("test:nonempty", "something"); + content.setProperty("test:mandatory", "something"); + content.setProperty("test:multiple", new String[] { "something" }); + validate(content); + + Set violations = getViolations(); + assertEquals(0, violations.size()); + + for (char c : "<>\"'&".toCharArray()) { + content.setProperty("test:escaped", "a" + c); + validate(content); + violations = getViolations(); + assertEquals(1, violations.size()); + } + } + + @Test public void testRequiredChildNode() throws Exception { start(config); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml 2010-03-04 13:12:23 UTC (rev 22029) @@ -435,6 +435,20 @@ nonempty + + + hipposysedit:field + + + test:escaped + + + String + + + escaped + + hipposysedit:field Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd 2010-03-03 16:55:19 UTC (rev 22028) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/resources/org/hippoecm/repository/test.cnd 2010-03-04 13:12:23 UTC (rev 22029) @@ -55,6 +55,7 @@ - test:optional (string) - test:nonempty (string) - test:mandatory (string) +- test:escaped (string) - test:multiple (string) multiple - test:autocreated (string) = 'auto' autocreated - test:protected (string) protected Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 From helpdesk at onehippo.com Thu Mar 4 14:42:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 14:46:59 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3877) Deprecate HippoRepositoryFactory In-Reply-To: <13118476.1227.1267016630435.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <32137774.6681.1267710170437.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3877?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3877: --------------------------------------- Summary: Deprecate HippoRepositoryFactory (was: Deprectate HippoRepositoryFactory) > Deprecate HippoRepositoryFactory > -------------------------------- > > Key: HREPTWO-3877 > URL: http://issues.onehippo.com/browse/HREPTWO-3877 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Berry van Halderen > Assignee: Berry van Halderen > Fix For: Backlog > > > In favor of using JNDI, optionally with a custom Inital context. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 15:22:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 15:26:59 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3931) Logging a failed action - Renaming Message-ID: <10837936.6769.1267712570668.JavaMail.jira@jira.vm.castaserver.com> Logging a failed action - Renaming ---------------------------------- Key: HREPTWO-3931 URL: http://issues.onehippo.com/browse/HREPTWO-3931 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 Repository Root: http://svn.hippocms.org/repos/hippo Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 Revision: 22028 Node Kind: directory Schedule: normal Last Changed Author: bvanhalderen Last Changed Rev: 22012 Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) Reporter: Sylvain P?lissier While validating https://issues.onehippo.com/browse/HREPTWO-3668 I noticed that after the rename operation fails there is still a message in the History that says 'user X renamed file Y'. STEPS: ------ - pick up a document that is offline - under Document Actions choose Rename... - click OK => 'Cannot rename document to same name'. This means that the operation has not be performed, it was rejected. Now visit the History and notice the line saying that it was renamed. However, I think the outcome should be equivalent to when one hits Cancel instead of OK on the Rename dialog: the operation is not taking place, so it is not to be reported. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 15:35:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 4 15:39:59 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3931) Logging a failed action - Renaming In-Reply-To: <10837936.6769.1267712570668.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <28364549.6802.1267713350723.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3931?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3931: ------------------------------------ Severity: Low (was: Normal) Assignee: Frank van Lankvelt Fix Version/s: r2.13.00 Priority: Low (was: Normal) > Logging a failed action - Renaming > ---------------------------------- > > Key: HREPTWO-3931 > URL: http://issues.onehippo.com/browse/HREPTWO-3931 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22028 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Priority: Low > Fix For: r2.13.00 > > > While validating https://issues.onehippo.com/browse/HREPTWO-3668 I noticed that after the rename operation fails there is still a message in the History that says 'user X renamed file Y'. > STEPS: > ------ > - pick up a document that is offline > - under Document Actions choose Rename... > - click OK => 'Cannot rename document to same name'. This means that the operation has not be performed, it was rejected. > Now visit the History and notice the line saying that it was renamed. However, I think the outcome should be equivalent to when one hits Cancel instead of OK on the Rename dialog: the operation is not taking place, so it is not to be reported. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 15:51:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 15:56:00 2010 Subject: [HippoRepos-dev] [JIRA] Reopened: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29595481.6860.1267714310811.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier reopened HREPTWO-3695: ---------------------------------------- Just checked the following and could not validated the change 'All document types are now allowed by default.' I have used a .jar file and I see the same things happening as is reported. Jasha says there is a workaround but it will break references. So I bump the importance up by one level. Builds I used for the validation of the change: URL: http://svn.onehippo.org/repos/hippo/hippo-ecm/trunk Repository Root: http://svn.onehippo.org/repos/hippo Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 Revision: 22029 Node Kind: directory Schedule: normal Last Changed Author: fvlankvelt Last Changed Rev: 22028 Last Changed Date: 2010-03-03 17:55:19 +0100 (Wed, 03 Mar 2010) 2.12.06: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 Repository Root: http://svn.hippocms.org/repos/hippo Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 Revision: 22028 Node Kind: directory Schedule: normal Last Changed Author: bvanhalderen Last Changed Rev: 22012 Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01 > Reporter: Jasha Joachimsthal > Assignee: Sylvain P?lissier > Priority: Low > Fix For: r2.12.05, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 15:51:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 15:56:01 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26334978.6869.1267714310941.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3695: --------------------------------------- Assignee: Bart van der Schans (was: Sylvain P?lissier) Priority: Normal (was: Low) > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01 > Reporter: Jasha Joachimsthal > Assignee: Bart van der Schans > Fix For: r2.12.05, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 15:53:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 15:57:58 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3148000.6872.1267714430379.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3695: --------------------------------------- Fix Version/s: r2.12.07 Affects Version/s: r2.12.06 r2.13.00 > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01, r2.12.06, r2.13.00 > Reporter: Jasha Joachimsthal > Assignee: Bart van der Schans > Fix For: r2.12.05, r2.12.07, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 16:16:50 2010 From: helpdesk at onehippo.com (JIRA (Dennis Dam)) Date: Thu Mar 4 16:20:58 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <16573537.6911.1267715810388.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85635#action_85635 ] Dennis Dam commented on HREPTWO-3651: ------------------------------------- The problem is not the > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 16:24:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 16:28:59 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3932) Calendar separates from the Date field after a scroll Message-ID: <27313642.6928.1267716290672.JavaMail.jira@jira.vm.castaserver.com> Calendar separates from the Date field after a scroll ----------------------------------------------------- Key: HREPTWO-3932 URL: http://issues.onehippo.com/browse/HREPTWO-3932 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Environment: URL: http://svn.onehippo.org/repos/hippo/hippo-ecm/trunk Repository Root: http://svn.onehippo.org/repos/hippo Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 Revision: 22029 Node Kind: directory Schedule: normal Last Changed Author: fvlankvelt Last Changed Rev: 22028 Last Changed Date: 2010-03-03 17:55:19 +0100 (Wed, 03 Mar 2010) Reporter: Sylvain P?lissier Fix For: r2.12.07, r2.13.00 While validating https://issues.onehippo.com/browse/HREPTWO-3845, I discovered this little issue. It affects both IE and FFx. STEPS: ------ - edit a document of type News - redimension the browser's window so that a vertical scrollbar becomes visible - click on the Calendar icon in the Date field - scroll down - notice the Calendar stays in the position on the screen where it was first displayed instead of staying near the Date field - maximize the browser's window, note that the calendar is not more displayed in its context. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 17:02:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 17:06:59 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3933) There is a 'Remove' button on the Dutch Document Picker Message-ID: <19034957.6969.1267718570509.JavaMail.jira@jira.vm.castaserver.com> There is a 'Remove' button on the Dutch Document Picker ------------------------------------------------------- Key: HREPTWO-3933 URL: http://issues.onehippo.com/browse/HREPTWO-3933 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Environment: URL: http://svn.onehippo.org/repos/hippo/hippo-ecm/trunk Repository Root: http://svn.onehippo.org/repos/hippo Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 Revision: 22029 Node Kind: directory Schedule: normal Last Changed Author: fvlankvelt Last Changed Rev: 22028 Last Changed Date: 2010-03-03 17:55:19 +0100 (Wed, 03 Mar 2010) Reporter: Sylvain P?lissier Fix For: r2.13.00 Attachments: docpicker_remove_btn.png Pls, see attached screenshot. STEPS: ------ - Edit news > mynews1 from within quickstart - select the word body in the field named Body - click the Internal Link button, 2nd from left, and choose a document to link to - dismiss the Document Picker dialog The word body should now be underlined - click the Internal Link button againa nd notice that a new button appears and that its label says 'Remove -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 4 17:06:45 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 4 17:10:56 2010 Subject: [HippoRepos-dev] [22030] hippo-ecm/trunk: HREPTWO-3922: the PackagedTextTemplate needs an application threadlocal Message-ID: <20100304160646.091D21C020@svn.vm.castaserver.com> Revision: 22030 Author: fvlankvelt Date: 2010-03-04 17:06:45 +0100 (Thu, 04 Mar 2010) Log Message: ----------- HREPTWO-3922: the PackagedTextTemplate needs an application threadlocal Note that issue cannot be resolved yet; the JcrEventListener requires a UserSession object to be set as a threadlocal as well. Modified Paths: -------------- hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/tree/ScrollBehavior.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/accordion/AccordionManagerBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/autocomplete/AutoCompleteBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/tree/TreeBehavior.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/browser/ScrollBehavior.java Modified: hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/tree/ScrollBehavior.java =================================================================== --- hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/tree/ScrollBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/tree/ScrollBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -33,7 +33,7 @@ private static final long serialVersionUID = 1L; private static final ResourceReference SCRIPT = new JavascriptResourceReference(ScrollBehavior.class, "scroll.js"); - private static final PackagedTextTemplate INIT = new PackagedTextTemplate(ScrollBehavior.class, "init_scroll.js"); + private final PackagedTextTemplate INIT = new PackagedTextTemplate(ScrollBehavior.class, "init_scroll.js"); private final ParameterModel model = new ParameterModel(); public ScrollBehavior() { 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 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -66,10 +66,8 @@ import org.hippoecm.frontend.plugins.xinha.services.images.XinhaImageService; import org.hippoecm.frontend.plugins.xinha.services.links.XinhaLinkService; import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; -import org.hippoecm.frontend.plugins.yui.YuiPluginHelper; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.DynamicTextTemplate; -import org.hippoecm.frontend.plugins.yui.webapp.IYuiManager; import org.hippoecm.frontend.service.IBrowseService; import org.hippoecm.frontend.service.render.HeaderContributorHelper; import org.hippoecm.frontend.service.render.RenderPlugin; @@ -94,7 +92,7 @@ private static final ResourceReference XINHA_MODAL_JS = new JavascriptResourceReference(XinhaDialogBehavior.class, "xinha-modal.js"); - private static final PackagedTextTemplate XINHA_INIT_GLOBALS = new PackagedTextTemplate(AbstractXinhaPlugin.class, + private final PackagedTextTemplate XINHA_INIT_GLOBALS = new PackagedTextTemplate(AbstractXinhaPlugin.class, "xinha_init.js"); private final String mode; Modified: hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerBehavior.java =================================================================== --- hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -21,7 +21,7 @@ public class EditorManagerBehavior extends AbstractYuiBehavior { private static final long serialVersionUID = 1L; - private static final PackagedTextTemplate XINHA_INIT_GLOBALS = new PackagedTextTemplate(AbstractXinhaPlugin.class, + private final PackagedTextTemplate XINHA_INIT_GLOBALS = new PackagedTextTemplate(AbstractXinhaPlugin.class, "xinha_init.js"); DynamicTextTemplate globals; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/accordion/AccordionManagerBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/accordion/AccordionManagerBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/accordion/AccordionManagerBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -30,7 +30,7 @@ private final static String SVN_ID = "$Id$"; //Provide a more generic approach by making the function call variable as well - private static final PackagedTextTemplate INIT = new PackagedTextTemplate(AccordionManagerBehavior.class, "init.js"); + private final PackagedTextTemplate INIT = new PackagedTextTemplate(AccordionManagerBehavior.class, "init.js"); private DynamicTextTemplate template; private String id; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/autocomplete/AutoCompleteBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/autocomplete/AutoCompleteBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/autocomplete/AutoCompleteBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -31,7 +31,7 @@ private static final long serialVersionUID = 1L; //Provide a more generic approach by making the function call variable as well - private static final PackagedTextTemplate INIT_AUTOCOMPLETE = new PackagedTextTemplate(AutoCompleteBehavior.class, + private final PackagedTextTemplate INIT_AUTOCOMPLETE = new PackagedTextTemplate(AutoCompleteBehavior.class, "init_autocomplete.js"); protected final AutoCompleteSettings settings; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -46,7 +46,7 @@ @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; - private static final PackagedTextTemplate INIT = new PackagedTextTemplate(YuiDatePicker.class, "init.js"); + private final PackagedTextTemplate INIT = new PackagedTextTemplate(YuiDatePicker.class, "init.js"); private static final ResourceReference SKIN = new CompressedResourceReference(YuiDatePicker.class, "skin.css"); private Component component; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -31,8 +31,7 @@ private static final long serialVersionUID = 1L; - private static final PackagedTextTemplate INIT_PAGE = new PackagedTextTemplate(PageLayoutBehavior.class, - "init_page.js"); + private final PackagedTextTemplate INIT_PAGE = new PackagedTextTemplate(PageLayoutBehavior.class, "init_page.js"); private PageLayoutSettings settings; private HippoTextTemplate template; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -37,7 +37,7 @@ private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private static final PackagedTextTemplate behaviorJs = new PackagedTextTemplate(WireframeBehavior.class, + private final PackagedTextTemplate behaviorJs = new PackagedTextTemplate(WireframeBehavior.class, "add_wireframe.js"); private WireframeSettings settings; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/tree/TreeBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/tree/TreeBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/tree/TreeBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -28,7 +28,6 @@ import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.HippoTextTemplate; import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; -import org.hippoecm.frontend.plugins.yui.webapp.IYuiManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +40,7 @@ static final Logger log = LoggerFactory.getLogger(TreeBehavior.class); //Provide a more generic approach by making the function call variable as well - private static final PackagedTextTemplate INIT_TREE = new PackagedTextTemplate(TreeBehavior.class, "init_tree.js"); + private final PackagedTextTemplate INIT_TREE = new PackagedTextTemplate(TreeBehavior.class, "init_tree.js"); protected final TreeSettings settings; private HippoTextTemplate template; Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/browser/ScrollBehavior.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/browser/ScrollBehavior.java 2010-03-04 13:12:23 UTC (rev 22029) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/browser/ScrollBehavior.java 2010-03-04 16:06:45 UTC (rev 22030) @@ -33,7 +33,7 @@ private static final long serialVersionUID = 1L; private static final ResourceReference SCRIPT = new JavascriptResourceReference(ScrollBehavior.class, "scroll.js"); - private static final PackagedTextTemplate INIT = new PackagedTextTemplate(ScrollBehavior.class, "init_scroll.js"); + private final PackagedTextTemplate INIT = new PackagedTextTemplate(ScrollBehavior.class, "init_scroll.js"); private final ParameterModel model = new ParameterModel(); public ScrollBehavior() { From helpdesk at onehippo.com Thu Mar 4 17:08:50 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Thu Mar 4 17:12:59 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3922) Serializable sessions in tomcat In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <1974784.6993.1267718930552.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85645#action_85645 ] Frank van Lankvelt commented on HREPTWO-3922: --------------------------------------------- remaining issue: the JcrEventListener depends on a userSession threadlocal to be present when it is being deserialized. java.lang.IllegalStateException: you can only locate or create sessions in the context of a request cycle at org.apache.wicket.Session.findOrCreate(Session.java:208) at org.apache.wicket.Session.get(Session.java:252) at org.hippoecm.frontend.JcrObservationManager.addEventListener(JcrObservationManager.java:828) at org.hippoecm.frontend.model.event.JcrEventListener.start(JcrEventListener.java:73) at org.hippoecm.frontend.model.event.JcrEventListener.readObject(JcrEventListener.java:96) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) > Serializable sessions in tomcat > ------------------------------- > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: persistent_session.log, tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > When tomcat shuts down, by default it will serialize sessions to disk and deserialize them when it is restarted. This can be disabled, as has been documented, but it would be better if this simply wasn't necessary. > ====== Original problem ===== > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 17:14:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 17:18:59 2010 Subject: [HippoRepos-dev] [JIRA] Reopened: (HREPTWO-3906) Searching for document with 2 words as search string leads to exception in logs In-Reply-To: <2515197.4447.1267459250623.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <4509665.6999.1267719290450.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3906?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier reopened HREPTWO-3906: ---------------------------------------- It still does it when the second search term has less than three characters. > Searching for document with 2 words as search string leads to exception in logs > ------------------------------------------------------------------------------- > > Key: HREPTWO-3906 > URL: http://issues.onehippo.com/browse/HREPTWO-3906 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Sylvain P?lissier > Fix For: r2.12.06, r2.13.00 > > > CMS 2010-03-01 16:58:04,942 ERROR [org.hippoecm.frontend.plugins.standards.search.TextSearchBuilder] Error executing query[text]: //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) > javax.jcr.query.InvalidQueryException: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" for statement: for $v in //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) return $v: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":": Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.(XPathQueryBuilder.java:303) > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.createQuery(XPathQueryBuilder.java:332) > at org.apache.jackrabbit.spi.commons.query.xpath.QueryBuilder.createQueryTree(QueryBuilder.java:39) > at org.apache.jackrabbit.spi.commons.query.QueryParser.parse(QueryParser.java:57) > at org.apache.jackrabbit.core.query.lucene.QueryImpl.(QueryImpl.java:92) > at org.apache.jackrabbit.core.query.lucene.SearchIndex.createExecutableQuery(SearchIndex.java:618) > at org.apache.jackrabbit.core.query.QueryImpl.init(QueryImpl.java:128) > at org.apache.jackrabbit.core.SearchManager.createQuery(SearchManager.java:316) > at org.apache.jackrabbit.core.query.QueryManagerImpl.createQuery(QueryManagerImpl.java:102) > at org.hippoecm.repository.decorating.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.impl.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.decorating.checked.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:48) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:49) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:27) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.plugins.standards.browse.BrowserSearchResult.getQueryResult(BrowserSearchResult.java:48) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.load(SearchDocumentsProvider.java:65) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.size(SearchDocumentsProvider.java:124) > at org.hippoecm.frontend.plugins.standards.list.datatable.ListDataTable.render(ListDataTable.java:158) > at org.hippoecm.frontend.plugins.cms.browse.list.SearchDocumentListingPlugin.render(SearchDocumentListingPlugin.java:151) > at org.hippoecm.frontend.plugins.cms.browse.DocumentCollectionView.render(DocumentCollectionView.java:142) > at org.hippoecm.frontend.plugins.cms.browse.Navigator.render(Navigator.java:103) > at org.hippoecm.frontend.service.render.AbstractRenderService.render(AbstractRenderService.java:386) > at org.hippoecm.frontend.service.render.RenderPlugin.render(RenderPlugin.java:124) > at org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin.render(TabsPlugin.java:127) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 17:20:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 17:25:00 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3906) Searching for document with 2 words as search string leads to exception in logs In-Reply-To: <2515197.4447.1267459250623.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <1041461.7024.1267719650775.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3906?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85653#action_85653 ] Sylvain P?lissier commented on HREPTWO-3906: -------------------------------------------- STEPS: ------ - Type the following search term to get an exception as per the attached e: abc d - Then hit Enter Note that if, after that, one searches with one or more terms that are at least three characters in length, then the search still operates. > Searching for document with 2 words as search string leads to exception in logs > ------------------------------------------------------------------------------- > > Key: HREPTWO-3906 > URL: http://issues.onehippo.com/browse/HREPTWO-3906 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Sylvain P?lissier > Fix For: r2.12.06, r2.13.00 > > > CMS 2010-03-01 16:58:04,942 ERROR [org.hippoecm.frontend.plugins.standards.search.TextSearchBuilder] Error executing query[text]: //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) > javax.jcr.query.InvalidQueryException: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" for statement: for $v in //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) return $v: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":": Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.(XPathQueryBuilder.java:303) > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.createQuery(XPathQueryBuilder.java:332) > at org.apache.jackrabbit.spi.commons.query.xpath.QueryBuilder.createQueryTree(QueryBuilder.java:39) > at org.apache.jackrabbit.spi.commons.query.QueryParser.parse(QueryParser.java:57) > at org.apache.jackrabbit.core.query.lucene.QueryImpl.(QueryImpl.java:92) > at org.apache.jackrabbit.core.query.lucene.SearchIndex.createExecutableQuery(SearchIndex.java:618) > at org.apache.jackrabbit.core.query.QueryImpl.init(QueryImpl.java:128) > at org.apache.jackrabbit.core.SearchManager.createQuery(SearchManager.java:316) > at org.apache.jackrabbit.core.query.QueryManagerImpl.createQuery(QueryManagerImpl.java:102) > at org.hippoecm.repository.decorating.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.impl.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.decorating.checked.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:48) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:49) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:27) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.plugins.standards.browse.BrowserSearchResult.getQueryResult(BrowserSearchResult.java:48) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.load(SearchDocumentsProvider.java:65) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.size(SearchDocumentsProvider.java:124) > at org.hippoecm.frontend.plugins.standards.list.datatable.ListDataTable.render(ListDataTable.java:158) > at org.hippoecm.frontend.plugins.cms.browse.list.SearchDocumentListingPlugin.render(SearchDocumentListingPlugin.java:151) > at org.hippoecm.frontend.plugins.cms.browse.DocumentCollectionView.render(DocumentCollectionView.java:142) > at org.hippoecm.frontend.plugins.cms.browse.Navigator.render(Navigator.java:103) > at org.hippoecm.frontend.service.render.AbstractRenderService.render(AbstractRenderService.java:386) > at org.hippoecm.frontend.service.render.RenderPlugin.render(RenderPlugin.java:124) > at org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin.render(TabsPlugin.java:127) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 4 17:22:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 4 17:26:59 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3906) Searching for document with 2 words as search string leads to exception in logs In-Reply-To: <2515197.4447.1267459250623.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21618127.7041.1267719770648.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3906?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3906: --------------------------------------- Attachment: e > Searching for document with 2 words as search string leads to exception in logs > ------------------------------------------------------------------------------- > > Key: HREPTWO-3906 > URL: http://issues.onehippo.com/browse/HREPTWO-3906 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Fix For: r2.12.06, r2.13.00 > > Attachments: e > > > CMS 2010-03-01 16:58:04,942 ERROR [org.hippoecm.frontend.plugins.standards.search.TextSearchBuilder] Error executing query[text]: //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) > javax.jcr.query.InvalidQueryException: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" for statement: for $v in //element(*, hippo:harddocument)[(hippo:paths = '2c21a29c-a5d1-4e84-aec4-594e5bf93b25') and jcr:contains(., 'keyword*')jcr:contains(., 'detail*')]/rep:excerpt(.) return $v: Lexical error at line 1, column 137. Encountered: "c" (99), after : ":": Lexical error at line 1, column 137. Encountered: "c" (99), after : ":" > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.(XPathQueryBuilder.java:303) > at org.apache.jackrabbit.spi.commons.query.xpath.XPathQueryBuilder.createQuery(XPathQueryBuilder.java:332) > at org.apache.jackrabbit.spi.commons.query.xpath.QueryBuilder.createQueryTree(QueryBuilder.java:39) > at org.apache.jackrabbit.spi.commons.query.QueryParser.parse(QueryParser.java:57) > at org.apache.jackrabbit.core.query.lucene.QueryImpl.(QueryImpl.java:92) > at org.apache.jackrabbit.core.query.lucene.SearchIndex.createExecutableQuery(SearchIndex.java:618) > at org.apache.jackrabbit.core.query.QueryImpl.init(QueryImpl.java:128) > at org.apache.jackrabbit.core.SearchManager.createQuery(SearchManager.java:316) > at org.apache.jackrabbit.core.query.QueryManagerImpl.createQuery(QueryManagerImpl.java:102) > at org.hippoecm.repository.decorating.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.impl.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42) > at org.hippoecm.repository.decorating.checked.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:48) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:49) > at org.hippoecm.frontend.plugins.standards.search.QueryResultModel.load(QueryResultModel.java:27) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.plugins.standards.browse.BrowserSearchResult.getQueryResult(BrowserSearchResult.java:48) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.load(SearchDocumentsProvider.java:65) > at org.hippoecm.frontend.plugins.standards.list.SearchDocumentsProvider.size(SearchDocumentsProvider.java:124) > at org.hippoecm.frontend.plugins.standards.list.datatable.ListDataTable.render(ListDataTable.java:158) > at org.hippoecm.frontend.plugins.cms.browse.list.SearchDocumentListingPlugin.render(SearchDocumentListingPlugin.java:151) > at org.hippoecm.frontend.plugins.cms.browse.DocumentCollectionView.render(DocumentCollectionView.java:142) > at org.hippoecm.frontend.plugins.cms.browse.Navigator.render(Navigator.java:103) > at org.hippoecm.frontend.service.render.AbstractRenderService.render(AbstractRenderService.java:386) > at org.hippoecm.frontend.service.render.RenderPlugin.render(RenderPlugin.java:124) > at org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin.render(TabsPlugin.java:127) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 4 17:53:17 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 4 17:57:26 2010 Subject: [HippoRepos-dev] [22031] hippo-ecm: HREPTWO-3906: more string manipulation Message-ID: <20100304165317.621111C020@svn.vm.castaserver.com> Revision: 22031 Author: fvlankvelt Date: 2010-03-04 17:53:16 +0100 (Thu, 04 Mar 2010) Log Message: ----------- HREPTWO-3906: more string manipulation Modified Paths: -------------- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-04 16:06:45 UTC (rev 22030) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-04 16:53:16 UTC (rev 22031) @@ -91,26 +91,31 @@ querySb.append(scope); } for (StringTokenizer st = new StringTokenizer(value, " "); st.hasMoreTokens();) { - if (hasCriteria) { - querySb.append(" and "); - } else { - hasCriteria = true; - } - querySb.append("jcr:contains(., '"); String token = st.nextToken(); if (token.length() < getMinimalLength()) { continue; } - valid = true; + StringBuilder tb = new StringBuilder(); for (int i = 0; i < token.length(); i++) { char c = token.charAt(i); if (ignoredChars.indexOf(c) == -1) { if (c == '\'') { - querySb.append('\''); + tb.append('\''); } - querySb.append(c); + tb.append(c); } } + if (tb.length() < getMinimalLength()) { + continue; + } + if (hasCriteria) { + querySb.append(" and "); + } else { + hasCriteria = true; + } + querySb.append("jcr:contains(., '"); + querySb.append(tb.toString()); + valid = true; if (wildcardSearch) { querySb.append('*'); } Modified: hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-04 16:06:45 UTC (rev 22030) +++ hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-04 16:53:16 UTC (rev 22031) @@ -117,6 +117,25 @@ } @Test + public void shortKeywordsAreIgnored() throws RepositoryException { + build(session, content); + build(session, alternative); + session.save(); + + TextSearchBuilder tsb = new TextSearchBuilder(); + tsb.setWildcardSearch(true); + tsb.setText("tit i"); + assertNotNull(tsb.getResultModel()); + BrowserSearchResult bsr = tsb.getResultModel().getObject(); + int count = 0; + for (NodeIterator iter = bsr.getQueryResult().getNodes(); iter.hasNext();) { + Node node = iter.nextNode(); + count++; + } + assertEquals(2, count); + } + + @Test public void wildcardSearchFindsWordHead() throws RepositoryException { build(session, content); session.save(); From svn-logs at hippocms.org Thu Mar 4 17:55:35 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 4 17:59:45 2010 Subject: [HippoRepos-dev] [22032] hippo-ecm: HREPTWO-3906: more string manipulation Message-ID: <20100304165535.0730C1C020@svn.vm.castaserver.com> Revision: 22032 Author: fvlankvelt Date: 2010-03-04 17:55:34 +0100 (Thu, 04 Mar 2010) Log Message: ----------- HREPTWO-3906: more string manipulation Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-04 16:53:16 UTC (rev 22031) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/search/TextSearchBuilder.java 2010-03-04 16:55:34 UTC (rev 22032) @@ -91,26 +91,31 @@ querySb.append(scope); } for (StringTokenizer st = new StringTokenizer(value, " "); st.hasMoreTokens();) { - if (hasCriteria) { - querySb.append(" and "); - } else { - hasCriteria = true; - } - querySb.append("jcr:contains(., '"); String token = st.nextToken(); if (token.length() < getMinimalLength()) { continue; } - valid = true; + StringBuilder tb = new StringBuilder(); for (int i = 0; i < token.length(); i++) { char c = token.charAt(i); if (ignoredChars.indexOf(c) == -1) { if (c == '\'') { - querySb.append('\''); + tb.append('\''); } - querySb.append(c); + tb.append(c); } } + if (tb.length() < getMinimalLength()) { + continue; + } + if (hasCriteria) { + querySb.append(" and "); + } else { + hasCriteria = true; + } + querySb.append("jcr:contains(., '"); + querySb.append(tb.toString()); + valid = true; if (wildcardSearch) { querySb.append('*'); } Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-04 16:53:16 UTC (rev 22031) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/search/TextSearchTest.java 2010-03-04 16:55:34 UTC (rev 22032) @@ -117,6 +117,25 @@ } @Test + public void shortKeywordsAreIgnored() throws RepositoryException { + build(session, content); + build(session, alternative); + session.save(); + + TextSearchBuilder tsb = new TextSearchBuilder(); + tsb.setWildcardSearch(true); + tsb.setText("tit i"); + assertNotNull(tsb.getResultModel()); + BrowserSearchResult bsr = tsb.getResultModel().getObject(); + int count = 0; + for (NodeIterator iter = bsr.getQueryResult().getNodes(); iter.hasNext();) { + Node node = iter.nextNode(); + count++; + } + assertEquals(2, count); + } + + @Test public void wildcardSearchFindsWordHead() throws RepositoryException { build(session, content); session.save(); From svn-logs at hippocms.org Thu Mar 4 21:36:26 2010 From: svn-logs at hippocms.org (abogaart) Date: Thu Mar 4 21:40:37 2010 Subject: [HippoRepos-dev] [22033] hippo-ecm: HREPTWO-3110: Document layout units / wireframes Message-ID: <20100304203626.A90C41C021@svn.vm.castaserver.com> Revision: 22033 Author: abogaart Date: 2010-03-04 21:36:26 +0100 (Thu, 04 Mar 2010) Log Message: ----------- HREPTWO-3110: Document layout units / wireframes https://issues.onehippo.com/browse/HREPTWO-3110 - updated javadocs to on layout classes and base yui classes Modified Paths: -------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiAjaxBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiContext.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiHeaderCache.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/init_page.js hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/JavascriptUtil.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/OptionsUtil.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/IYuiManager.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppSettings.java Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiAjaxBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiAjaxBehavior.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiAjaxBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -25,6 +25,29 @@ import org.hippoecm.frontend.plugins.yui.javascript.AjaxSettings; import org.hippoecm.frontend.plugins.yui.webapp.IYuiManager; +/** + * Base class for {@link AbstractDefaultAjaxBehavior}s that want to use YUI modules. It uses a {@link IYuiContext} to + * register all required components. The {@link IYuiContext} is created by a (global) {@link IYuiManager} which, in this + * case, lives inside the {@link Page} (as an {@link IBehavior}) that is retrieved by component.getPage() + * + *

+ * To allow clientside javascript components to do callbacks in a more flexible way than, for example, just sticking + * them inside an element's onclick attribute, this behavior uses an {@link AjaxSettings} instance in which it will + * store the callbackUrl, a list of allowed callbackParameters and an anonymous function that takes the callbackUrl as + * an argument and executes the callbackScript that is generated by the {@link AbstractDefaultAjaxBehavior}. + *

+ * + *

+ * Subclasses should override addHeaderContribution(IYuiContext context) to get access to the + * {@link IYuiContext}. + *

+ * + *

+ * Note: This behavior skips adding the necessary Wicket-Ajax header contributions, as this is handled by the + * {@link org.hippoecm.frontend.plugins.yui.header.YuiHeaderCache} + *

+ */ + public abstract class AbstractYuiAjaxBehavior extends AbstractDefaultAjaxBehavior { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -39,7 +62,7 @@ } protected void updateAjaxSettings() { - if(settings != null) { + if (settings != null) { settings.setCallbackUrl(getCallbackUrl().toString()); settings.setCallbackFunction(getCallbackFunction()); settings.setCallbackParameters(getCallbackParameters()); @@ -58,28 +81,24 @@ /** * Provide custom callbackParameters + * * @return JavascriptObjectMap containing key/value pairs that should be used as callbackParameters */ protected Map getCallbackParameters() { return null; } - - @Override - protected void onBind() { - super.onBind(); - } - /** - * Override to implement header contrib + * Override this method to get access to the IYuiContext + * * @param context + * The IYuiContext this behavior can use to register YUI-modules and the likes. */ public void addHeaderContribution(IYuiContext context) { } - /** - * Don't call super since WicketAjax is loaded by Yui webapp behavior + * Don't call super since WicketAjax is loaded by Yui webapp behavior * TODO: webapp ajax is configurable, maybe check here and still load it. */ @Override @@ -94,7 +113,8 @@ } } if (context == null) { - throw new IllegalStateException("Page has no yui manager behavior, unable to register module dependencies."); + throw new IllegalStateException( + "Page has no yui manager behavior, unable to register module dependencies."); } } onRenderHead(response); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiBehavior.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/AbstractYuiBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -23,14 +23,24 @@ import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.webapp.IYuiManager; +/** + * Base class for behaviors that want to use YUI modules. It uses a {@link IYuiContext} to register all + * required components. The {@link IYuiContext} is created by a (global) {@link IYuiManager} which, in this case, lives + * inside the {@link Page} (as an {@link IBehavior}) that is retrieved by component.getPage() + * + *

+ * Subclasses should override addHeaderContribution(IYuiContext context) to get access to the + * {@link IYuiContext}. + *

+ */ public class AbstractYuiBehavior extends AbstractBehavior { @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; + private static final String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; private Component component; - private IYuiContext _helper; + private IYuiContext context; @Override public void bind(Component component) { @@ -43,10 +53,11 @@ } /** - * Override to implement header contrib - * @param helper + * Override this method to get access to the IYuiContext + * + * @param context The IYuiContext this behavior can use to register YUI-modules and the likes. */ - public void addHeaderContribution(IYuiContext helper) { + public void addHeaderContribution(IYuiContext context) { } /** @@ -55,24 +66,29 @@ */ @Override public final void renderHead(IHeaderResponse response) { - if (_helper == null) { + if (context == null) { Page page = component.getPage(); for (IBehavior behavior : page.getBehaviors()) { if (behavior instanceof IYuiManager) { - _helper = ((IYuiManager) behavior).newContext(); - addHeaderContribution(_helper); + context = ((IYuiManager) behavior).newContext(); + addHeaderContribution(context); break; } } - if (_helper == null) { + if (context == null) { throw new IllegalStateException( "Page has no yui manager behavior, unable to register module dependencies."); } } onRenderHead(response); - _helper.renderHead(response); + context.renderHead(response); } - + + /** + * Hook method for doing some custom renderHead logic. + * + * @param response + */ protected void onRenderHead(IHeaderResponse response) { } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiContext.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiContext.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiContext.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -31,8 +31,15 @@ import org.onehippo.yui.YuiNamespace; /** - * The YuiContext uses the shared {@link YuiHeaderCache} service to load YUI-modules - * and minimize the response footprint. + * The YuiContext uses the shared {@link YuiHeaderCache} service for loading/caching YUI-modules and header + * contributions. + * + *

+ * Note: the addModule(String module) method will load the provided module within the + * {@link YahooNamespace} scope. + *

+ * + * @see IYuiContext */ public class YuiContext implements IYuiContext { @SuppressWarnings("unused") @@ -78,86 +85,50 @@ onloads = new LinkedHashSet(); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addModule(java.lang.String) - */ public void addModule(String module) { addModule(YahooNamespace.NS, module); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addModule(org.onehippo.yui.YuiNamespace, java.lang.String) - */ public void addModule(YuiNamespace ns, String module) { modules.add(cache.getDependenciesSet(ns, module)); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addTemplate(org.hippoecm.frontend.plugins.yui.header.templates.FinalTextTemplate) - */ public void addTemplate(FinalTextTemplate template) { templates.add(template); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addTemplate(java.lang.Class, java.lang.String, java.util.Map) - */ public void addTemplate(Class clazz, String filename, Map parameters) { templates.add(new FinalTextTemplate(clazz, filename, parameters)); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addTemplate(org.hippoecm.frontend.plugins.yui.header.templates.DynamicTextTemplate) - */ public void addTemplate(DynamicTextTemplate template) { templates.add(template); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addCssReference(org.apache.wicket.ResourceReference) - */ public void addCssReference(ResourceReference reference) { refs.add(cache.getCssReference(reference)); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addJavascriptReference(org.apache.wicket.ResourceReference) - */ public void addJavascriptReference(ResourceReference reference) { refs.add(cache.getJavascriptReference(reference)); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addOnDomLoad(java.lang.String) - */ public void addOnDomLoad(String string) { addOnDomLoad(new Model(string)); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addOnDomLoad(org.apache.wicket.model.IModel) - */ public void addOnDomLoad(IModel model) { onloads.add(new Onload(model, Onload.Type.DOM)); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addOnWinLoad(java.lang.String) - */ public void addOnWinLoad(String string) { addOnWinLoad(new Model(string)); } - /* (non-Javadoc) - * @see org.hippoecm.frontend.plugins.yui.header.IYuiContext#addOnWinLoad(org.apache.wicket.model.IModel) - */ public void addOnWinLoad(IModel model) { onloads.add(new Onload(model, Onload.Type.WINDOW)); } - /* (non-Javadoc) - * @see org.apache.wicket.markup.html.IHeaderContributor#renderHead(org.apache.wicket.markup.html.IHeaderResponse) - */ public void renderHead(IHeaderResponse response) { if (modules != null) { renderModules(modules, response); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiHeaderCache.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiHeaderCache.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/YuiHeaderCache.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -39,15 +39,24 @@ /** * A Wicket Ajax request can generate a response containing additional javascript and css resources - * to be loaded on the client. Subsequently requesting a component that dependends on, for example, - * six YUI-modules that have to be loaded in a specific order as well, can lead to some heavy extra + * to be loaded on the client. Subsequently requesting a component that depends on, for example, + * six YUI-modules that have to be loaded in a pre-defined order, will lead to lot's of redundant * data in the response, not to mention the IO and file parsing that is produced by the YUI module - * loading mechanism. + * loading mechanism on the server. + * + *

* This class uses the {@link CachedYuiDependencyResolver} to retrieve the Set * of resources belonging to a YUI-module and caches them locally. {@link YuiContext}s will share * a reference to the resources, making it possible to skip static resources that have already been - * loaded on the client. + * loaded on the client. + *

* + *

+ * It will automatically load the YUI-logger through it's local {@link IYuiContext} when running in Wicket development + * mode. See {@link org.apache.wicket.Application#getConfigurationType}.
+ * It will also the Wicket-Ajax javascript dependencies if needed and subsequently load the hippoajax YUI module, which + * adds cleanup-hooks for YUI modules as well as some other utility methods. + *

*/ public class YuiHeaderCache implements IHeaderContributor { @SuppressWarnings("unused") @@ -69,7 +78,6 @@ final Map moduleCache = new HashMap(); final Map moduleSetsCache = new HashMap(); - //final Set localModules = new LinkedHashSet(); final YuiContext localContext = new YuiContext(this); private boolean loadWicketAjax = false; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -19,6 +19,19 @@ import org.apache.commons.lang.builder.ToStringStyle; import org.apache.wicket.IClusterable; +/** + * The YuiId allows for transparent element id resolution, without having to worry about id clashes on the client. + * + * The idea is really simple. A YuiId consists of an id value, and an optional parentId value. If the parentId is set, + * the YuiId will return an elementId like 'parentId:id', else it will only return the local id. + * + * The id value corresponds to an element in a {@link org.apache.wicket.Component}'s html file through the attribute + * yui:id, the parent id is a normal id-attribute, normally generated by Wicket and added to the YuiId once it's known. + * + * The YAHOO.hippo.LayoutManager module uses YAHOO.hippo.Dom.resolveElement(id) to resolve elements by their YuiId. + * For more info see: + * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/hippodom/hippodom.js + */ public class YuiId implements IClusterable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -28,7 +28,7 @@ * Base class for passing configuration to a YUI component on the client. *

* This class has been deprecated. Create a java bean instead and use the - * PluginConfigMapper and JavascriptMapper helpers to do the serialization. + * {@link PluginConfigMapper} and JavascriptMapper helpers to do the serialization. */ @Deprecated public class YuiObject implements IClusterable { Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -15,11 +15,21 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import org.apache.wicket.behavior.IBehavior; import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -public interface IWireframeService { - @SuppressWarnings("unused") +/** + * Behaviors implementing this service can be queried by nested component {@link WireframeBehavior}'s for their id + * value. This is because a nested wireframe needs to know it's parent id value during the render phase. + */ +public interface IWireframeService extends IBehavior { final static String SVN_ID = "$Id$"; + /** + * Return the {@link YuiId} value that represents the wireframe managed by the {@link IBehavior} that is + * implementing this interface. + * + * @return a {@link YuiId} value representing the wireframe + */ YuiId getParentId(); } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -25,6 +25,19 @@ import org.hippoecm.frontend.plugins.yui.javascript.YuiId; import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; +/** + * Special purpose {@link WireframeBehavior} that automatically binds itself to the document body and creates a + * wireframe that takes up the full viewport and is registered as the root of the applications wireframe structure. + *

+ * In accordance with YUI-grids CSS, the default id value for the wireframe root element is set to "doc3". + *

+ *

+ * Note: It doesn't support dynamic registration with parent wireframes or looking up {@link Unitbehavior}'s from child + * components because of it's static nature. This can be achieved by the {@link WireframeBehavior} + *

+ * + * @see WireframeBehavior + */ public class PageLayoutBehavior extends AbstractYuiAjaxBehavior implements IWireframeService { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -31,6 +31,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * This behavior stores the component id as it's markupId in the {@link UnitSettings} and if the request rendering this + * behavior is an Ajax-request, it will force the whole wireframe to re-render (since this unit might be added to a + * wireframe that has already rendered. + */ public class UnitBehavior extends AbstractBehavior { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -17,6 +17,7 @@ import org.apache.wicket.behavior.IBehavior; import org.apache.wicket.util.value.ValueMap; +import org.hippoecm.frontend.plugin.IPlugin; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.Plugin; import org.hippoecm.frontend.plugin.config.IPluginConfig; @@ -25,6 +26,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +/** + * Special purpose {@link Plugin} that allows us to add the behavior through configuration instead of adding it + * in code to our component. + * + * See {@link IBehaviorService} and {@link IPlugin} for more info. + */ public class UnitPlugin extends Plugin implements IBehaviorService { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -27,6 +27,54 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Contains all settings of a YUI unit. + * + *

    + *
  • + * POSITION: String representation of the position this unit has in the wireframe; top, right, bottom, left or center + *
    • + *
  • + * ID: a {@link YuiId} value representing the unit's root element. + *
    • + *
  • + * BODY: a {@link YuiId} value representing the unit's body element. + *
    • + *
  • + * WIDTH: width (in pixels) that the unit will take up in the wireframe (only applies to left and right units and + * is required) + *
    • + *
  • + * HEIGHT: height (in pixels) that the unit will take up in the wireframe (only applies to top and bottom units + * and is required). + *
    • + *
  • + * MIN_WIDTH: minimum width (in pixels) the unit will take up in the wireframe (only applies to left and right units + * and is required) + *
    • + *
  • + * MIN_HEIGHT: minimum height (in pixels) that the unit will take up in the wireframe (only applies to top and bottom + * units and is required). + *
    • + *
  • + * GUTTER: the gutter applied to the unit's wrapper, before the content, for example "5px". + *
    • + *
  • + * SCROLL: Boolean indicating whether the unit's body should have scroll bars if the body content is larger than the + * display area. + *
    • + *
  • + * RESIZE: Boolean indicating whether this unit is resizeable. + *
    • + *
  • + * USE_SHIM: Sometimes resizing a unit over an iframe (or other elements) will lead to unexpected behavior, especially + * in everyone's favorite browser IE. Set this property to true to fix it. + *
    • + *
  • + * Z_INDEX: z-index for this unit. TODO: check if this works. + *
    • + *
+ */ public class UnitSettings extends YuiObject { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -49,7 +97,8 @@ private static final BooleanSetting SCROLL = new BooleanSetting("scroll"); private static final BooleanSetting RESIZE = new BooleanSetting("resize"); private static final BooleanSetting USE_SHIM = new BooleanSetting("useShim"); - + + //TODO: does this still work? private static final IntSetting Z_INDEX = new IntSetting("zindex"); protected final static YuiType TYPE = new YuiType(POSITION, ID, BODY, WIDTH, HEIGHT, MIN_WIDTH, MIN_HEIGHT, GUTTER, Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -30,7 +30,106 @@ import org.hippoecm.frontend.plugins.yui.javascript.IYuiListener; import org.hippoecm.frontend.plugins.yui.javascript.YuiId; import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; +import org.hippoecm.frontend.service.render.RenderService; +/** + * The WireframeBehavior allows you to create cross-browser application layouts based on the YUI Layout Manager: + * http://developer.yahoo.com/yui/layout/ + * + *

+ * A layout or wireframe is a structured block containing five layout units, top, + * right, bottom, left and center (see + * http://developer.yahoo.com/yui/layout/#wireframe). + * The center unit is always present and fills up the space not occupied by it's + * neighboring units. Units can be resized (within configurable boundaries) or have a fixed width/height and can be + * configured to render scrollbars if needed. A wireframe can either be added to the body-element and take up the full + * viewport, or be added to an existing element with custom width and height constraints. In both cases a resize of the + * viewport will cause the wireframe to resize itself within the new given boundaries. + *

+ * + *

+ * Wireframes can be nested as well, both render and resize events will be fired by the nearest ancestor unit, which + * will provide the new available width and height values. + *

+ * + *

+ * Every wireframe and unit corresponds with a body element in the DOM. This element is identified by it's id attribute + * which should be known at render time and is stored, together with all other settings, inside the + * {@link WireframeSettings} object. During the renderHead phase, this behavior will register a new wireframe with it's + * configuration object (a JSON serialized version of the {@link WireframeSettings} on the client, which will than be + * instantiated and rendered on either window.load or after Wicket has finished processing the Ajax response. + *

+ * + *

+ * When a wireframe is rendered, it will create a new node structure inside it's body-element, representing the new + * wireframe and it's units. It will than move the elements representing the units into their new container elements. + *

+ * + *

+ * For example: (our wireframe root element is identified by id 'root' and contains two units: top[id='top'] and + * center[id='center']) + *

+ * + * <div id="root">
+ *   <div id="top">[ Top ]</div>
+ *   <div id="center">[ Center ]</div>
+ * </div> + *

+ * + *

+ * After the wireframe has rendered it will look something like (this is a slimmed down version of the real deal for the + * sake of readability) + *

+ * <div id="root" class="yui-layout">
+ *   <div class="yui-layout-doc">
+ *     <div class="yui-layout-unit yui-layout-unit-top">
+ *       ..
+ *         <div id="top">[ Top ]</div>
+ *       ..
+ *     </div>

+ *     <div class="yui-layout-unit yui-layout-unit-center">
+ *       ..
+ *         <div id="center">[ Center ]</div>
+ *       ..
+ *     </div>
+ *   </div>
+ * </div>
+ *

+ * + *

+ * In the above example, the dots are actual elements added by YUI used for handling size, scrollbars, borders, etc. + *

+ * + *

+ * As stated before, the id's of the wireframe's root element and all of it's units body elements, should be known at + * render time. They are stored inside the {@link WireframeSettings} object which is serialized to JSON and registered + * on the client.
+ * If our application only contains one single wireframe with two static unit, we can hard-code the id values into the + * accompanying .html file and {@WireframeSettings}. But, as we are working in a composite environment, + * we want our wireframes to be re-usable, without having to worry about id clashes on the client. To accompany this, we + * created the {@link YuiId}, which allows us to do just that. See {@link YuiId} for more about that. + *

+ * + *

+ * When a wireframe is nested inside another wireframe, YUI demands that the child wireframe knows the id value of it's + * parent wireframe at render time. Because of this, a wireframe will look up it's ancestors graph for a class + * implementing the {@link IWireframeService} and, if found, retrieves and stores the parent id. + *

+ * + *

+ * Another feature of the wireframe behavior is to dynamically find child components that contain a {@link UnitBehavior} + * and register them in the {@link WireframeSettings}. This way, a {@link RenderService} can add extension points for + * units, and know nothing about them except their position until render time. + *

+ * + *

+ * To integrate the YUI layouts into Wicket, we have added a clientside manager component that handles the lifecycle, + * rendering and resizing of the wireframe structure.
+ * For more info see the comments in + * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/layoutmanager/layoutmanager-debug.js + *

+ */ + public class WireframeBehavior extends AbstractYuiBehavior implements IWireframeService { @SuppressWarnings("unused") @@ -105,13 +204,15 @@ public void onRenderHead(IHeaderResponse response) { settings.setMarkupId(component.getMarkupId(true)); + //If linkedWithParent, look for an ancestor Component that implements IWireframeService and retrieve it's id if (settings.isLinkedWithParent()) { Component parent = component; boolean found = false; while (!found) { parent = parent.getParent(); if (parent == null) { - throw new RuntimeException("Parent layout behavior not found for component[" + component.getMarkupId() + "]"); + throw new RuntimeException("Parent layout behavior not found for component[" + + component.getMarkupId() + "]"); } for (Iterator j = parent.getBehaviors().iterator(); j.hasNext();) { Object parentBehavior = j.next(); @@ -125,6 +226,8 @@ } } + //Visit child components in order to find components that contain a {@link UnitBehavior}. If another wireframe + //or unit is encountered, stop going deeper. MarkupContainer cont = (MarkupContainer) component; cont.visitChildren(new IVisitor() { public Object component(Component component) { Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -16,49 +16,34 @@ package org.hippoecm.frontend.plugins.yui.layout; import org.apache.wicket.behavior.IBehavior; -import org.hippoecm.frontend.plugin.IPlugin; import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.Plugin; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.yui.YuiPluginHelper; import org.hippoecm.frontend.service.IBehaviorService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -public class WireframePlugin extends WireframeBehavior implements IPlugin, IBehaviorService { +/** + * Special purpose {@link Plugin} that allows us to add the behavior through configuration instead of adding it + * in code to our component. + * + * See {@link IBehaviorService} for info how to configure this. + */ +public class WireframePlugin extends Plugin implements IBehaviorService { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private final static Logger log = LoggerFactory.getLogger(WireframePlugin.class); - - public static final String UNITS = "yui.units"; - public static final String WRAPPERS = "yui.wrappers"; - public static final String ROOT = "yui.root"; - public static final String LINKED = "yui.linked"; - public static final String CLIENT_CLASSNAME = "yui.classname"; - - private IPluginConfig config; - public WireframePlugin(IPluginContext context, IPluginConfig config) { - super(new WireframeSettings(YuiPluginHelper.getConfig(config))); - - this.config = config; + super(context, config); context.registerService(this, config.getString(ID)); } - public IBehavior getBehavior() { - return this; - } - public String getComponentPath() { - return config.getString(IBehaviorService.PATH); + return getPluginConfig().getString(IBehaviorService.PATH); } - public void start() { + public IBehavior getBehavior() { + return new WireframeBehavior(new WireframeSettings(YuiPluginHelper.getConfig(getPluginConfig()))); } - - public void stop() { - } - } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -26,6 +26,39 @@ import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +/** + * Contains all settings of a wireframe and it's units. + * + *
    + *
  • + * ROOT_ID: a {@link YuiId} value representing the wireframe's root element. + *
    • + *
  • + * PARENT_ID: a {@link YuiId} value representing the parent wireframe (value will be auto-set by the {@link + * WireframeBehavior} when LINKED_WITH_PARENT is true. + *
    • + *
  • + * LINKED_WITH_PARENT: when set to true, the wireframe will register itself with it's parent wireframe and sync render + * and resize events. + *
    • + *
  • + * UNITS: Array of {@UnitSettings} representing the units for this wireframe. These can either be set by the same + * IPluginConfig object as the {@link WireframeSettings} or by merging the {@UnitSettings} of dynamically found + * {@link UnitBehavior}s.
    + * The easiest way to configure units is storing the html and configuration all in the same place as the wireframe's + * html and configuration. If we use an {@link IPluginConfig} for configuration, we can add a StringArray property + * and add the positional name of the units we'd like to add: for example "top" and "center". This will cause the + * {@link WireframeSettings} to lookup two String properties on the IPluginConfig named "top" and "center" which + * should contain a comma-separated string of UnitSettings, like "id=center,scroll=true,width=120". + *
    • + *
  • + * WRAPPERS: TODO + *
    • + *
+ * + * Warning: this class currently extends the YuiObject which is deprecated and will soon be replaced by a POJO settings + * file. Not sure how to handle default values and things like dont-escape-string yet. + */ public class WireframeSettings extends YuiObject { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/init_page.js =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/init_page.js 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/init_page.js 2010-03-04 20:36:26 UTC (rev 22033) @@ -1,2 +1,17 @@ +/* + * 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. + */ YAHOO.hippo.LayoutManager.addRoot('${id}', ${class}, ${config}); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/JavascriptUtil.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/JavascriptUtil.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/JavascriptUtil.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -18,6 +18,8 @@ import java.util.regex.Pattern; +//TODO: remove +@Deprecated public class JavascriptUtil { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -25,8 +27,8 @@ public static final String SINGLE_QUOTE = "'"; private static Pattern numbers = Pattern.compile("\\d*"); - //private static Pattern functions = Pattern.compile("(\\w+)\\.(\\w+)"); - + + @Deprecated public static String serialize2JS(String value) { if (value == null) return "null"; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/OptionsUtil.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/OptionsUtil.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/util/OptionsUtil.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -19,12 +19,16 @@ import java.util.HashMap; import java.util.Map; +//TODO: remove + +@Deprecated public class OptionsUtil { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; public static final String KEY_VALUE_DELIM = "="; + @Deprecated public static void addKeyValuePairsToMap(Map map, String... pairs) { for(String option : pairs) { int delimIndex = option.indexOf(KEY_VALUE_DELIM); @@ -34,6 +38,7 @@ } } + @Deprecated public static Map keyValuePairsToMap(String... pairs) { Map map = new HashMap(); addKeyValuePairsToMap(map, pairs); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/IYuiManager.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/IYuiManager.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/IYuiManager.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -20,15 +20,16 @@ import org.hippoecm.frontend.plugins.yui.header.IYuiContext; /** - * {@link IYuiManager} implementations will be used as a service for creating {@link IYuiContext} instances. - * These should all use the same {@link YuiHeaderCache}. + * {@link IYuiManager} implementations will be used as a service for creating {@link IYuiContext} instances. These + * should all use the same {@link org.hippoecm.frontend.plugins.yui.header.YuiHeaderCache} as their backing model. */ public interface IYuiManager extends IClusterable { final static String SVN_ID = "$Id$"; - + /** - * Create a new {@link IYuiContext} that is backed up by a centrally managed {@link YuiHeaderCache} + * Create a new {@link IYuiContext} that is backed up by a centrally managed + * {@link org.hippoecm.frontend.plugins.yui.header.YuiHeaderCache} * * @return A new {@link IYuiContext} to add header contributions to */ Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppBehavior.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -23,6 +23,24 @@ import org.hippoecm.frontend.plugins.yui.header.YuiHeaderCache; import org.onehippo.yui.YahooNamespace; +/** + * This is the base behavior needed for developing Wicket applications using the YUI framework developed by Hippo. + * + *

+ * It's most important feature is implementing the {@link IYuiManager} interface, enabling the + * {@link AbstractYuiBehavior} and {@link AbstractYuiAjaxBehavior} to retrieve {@link IYuiContext} instances, and thus + * should be added to the {@link Page} instance of your application (this is required). + *

+ *

+ * It also exposes the possibility of pre-loading the stylesheets of the YUI CSS foundation: + * reset, fonts, + * grids, base + * and reset-fonts-grids stylesheets, as well as pre-loading Wicket-Ajax dependencies. This can be configured in the + * {@link WebAppSettings}. + *

+ * + * @see IYuiManager + */ public class WebAppBehavior extends AbstractBehavior implements IYuiManager { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppSettings.java 2010-03-04 16:55:34 UTC (rev 22032) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/webapp/WebAppSettings.java 2010-03-04 20:36:26 UTC (rev 22033) @@ -17,6 +17,11 @@ import java.io.Serializable; +/** + * Setting for {@link WebAppbehavior}. + * + * Wicket-Ajax is loaded by default. + */ public class WebAppSettings implements Serializable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; From svn-logs at hippocms.org Fri Mar 5 02:06:50 2010 From: svn-logs at hippocms.org (abogaart) Date: Fri Mar 5 02:11:00 2010 Subject: [HippoRepos-dev] [22034] hippo-ecm: HREPTWO-3110 - Document layout units / wireframes Message-ID: <20100305010650.39E501C020@svn.vm.castaserver.com> Revision: 22034 Author: abogaart Date: 2010-03-05 02:06:49 +0100 (Fri, 05 Mar 2010) Log Message: ----------- HREPTWO-3110 - Document layout units / wireframes - changed some bits Modified Paths: -------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-04 20:36:26 UTC (rev 22033) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-05 01:06:49 UTC (rev 22034) @@ -19,17 +19,16 @@ import org.hippoecm.frontend.plugins.yui.javascript.YuiId; /** - * Behaviors implementing this service can be queried by nested component {@link WireframeBehavior}'s for their id - * value. This is because a nested wireframe needs to know it's parent id value during the render phase. + * Base wireframe interface, allows wireframes that are linked to their parent to register + * with their parent through the Wicket component tree model. */ public interface IWireframeService extends IBehavior { final static String SVN_ID = "$Id$"; /** - * Return the {@link YuiId} value that represents the wireframe managed by the {@link IBehavior} that is - * implementing this interface. + * Return the root id of this wireframe * - * @return a {@link YuiId} value representing the wireframe + * @return the root {@link YuiId} of this wireframe */ YuiId getParentId(); } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-05 01:06:49 UTC (rev 22034) @@ -33,8 +33,8 @@ /** * This behavior stores the component id as it's markupId in the {@link UnitSettings} and if the request rendering this - * behavior is an Ajax-request, it will force the whole wireframe to re-render (since this unit might be added to a - * wireframe that has already rendered. + * behavior is an Ajax-request, it will force the whole wireframe to re-render (since this unit might be added to an + * already existing wireframe). */ public class UnitBehavior extends AbstractBehavior { @SuppressWarnings("unused") Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-04 20:36:26 UTC (rev 22033) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-05 01:06:49 UTC (rev 22034) @@ -15,8 +15,6 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import java.util.Iterator; - import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Component.IVisitor; @@ -105,7 +103,7 @@ * render time. They are stored inside the {@link WireframeSettings} object which is serialized to JSON and registered * on the client.
* If our application only contains one single wireframe with two static unit, we can hard-code the id values into the - * accompanying .html file and {@WireframeSettings}. But, as we are working in a composite environment, + * accompanying .html file and {@link WireframeSettings}. But, as we are working in a composite environment, * we want our wireframes to be re-usable, without having to worry about id clashes on the client. To accompany this, we * created the {@link YuiId}, which allows us to do just that. See {@link YuiId} for more about that. *

@@ -128,14 +126,17 @@ * For more info see the comments in * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/layoutmanager/layoutmanager-debug.js *

+ * + * @see org.hippoecm.frontend.plugins.yui.layout.WireframeSettings + * @see org.hippoecm.frontend.plugins.yui.javascript.YuiId */ public class WireframeBehavior extends AbstractYuiBehavior implements IWireframeService { + private static final long serialVersionUID = 1L; @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; - private static final long serialVersionUID = 1L; private final PackagedTextTemplate behaviorJs = new PackagedTextTemplate(WireframeBehavior.class, "add_wireframe.js"); @@ -214,8 +215,7 @@ throw new RuntimeException("Parent layout behavior not found for component[" + component.getMarkupId() + "]"); } - for (Iterator j = parent.getBehaviors().iterator(); j.hasNext();) { - Object parentBehavior = j.next(); + for (Object parentBehavior : parent.getBehaviors()) { if (parentBehavior instanceof IWireframeService) { IWireframeService service = (IWireframeService) parentBehavior; settings.setParentId(service.getParentId()); @@ -231,8 +231,7 @@ MarkupContainer cont = (MarkupContainer) component; cont.visitChildren(new IVisitor() { public Object component(Component component) { - for (Iterator i = component.getBehaviors().iterator(); i.hasNext();) { - Object behavior = i.next(); + for (Object behavior : component.getBehaviors()) { if (behavior instanceof IWireframeService) { return CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; } else if (behavior instanceof UnitBehavior) { From helpdesk at onehippo.com Fri Mar 5 10:06:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:11:02 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3934) Improve documentation Message-ID: <17096463.7240.1267780010691.JavaMail.jira@jira.vm.castaserver.com> Improve documentation --------------------- Key: HREPTWO-3934 URL: http://issues.onehippo.com/browse/HREPTWO-3934 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Vivek Kumar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:09:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:14:01 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3935) how to use template builder Message-ID: <5294067.7249.1267780190349.JavaMail.jira@jira.vm.castaserver.com> how to use template builder --------------------------- Key: HREPTWO-3935 URL: http://issues.onehippo.com/browse/HREPTWO-3935 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Vivek Kumar how to use it correctly how the templates can be customized how the builder can be used how to use (cms) plugins how to plug in taxonomy and drop-down boxes how to export schema (= cnd + type description) for reuse in the project -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:11:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:16:01 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3936) howto setup authorization on folders Message-ID: <8089535.7251.1267780310341.JavaMail.jira@jira.vm.castaserver.com> howto setup authorization on folders ------------------------------------ Key: HREPTWO-3936 URL: http://issues.onehippo.com/browse/HREPTWO-3936 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Vivek Kumar how to enable/disable folders for groups / roles / users -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:13:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:18:01 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3937) how to setup folder types (restrict document types) Message-ID: <32663245.7255.1267780430407.JavaMail.jira@jira.vm.castaserver.com> how to setup folder types (restrict document types) --------------------------------------------------- Key: HREPTWO-3937 URL: http://issues.onehippo.com/browse/HREPTWO-3937 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Vivek Kumar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:15:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:20:05 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3938) howto add a section to the browser Message-ID: <13127566.7257.1267780550421.JavaMail.jira@jira.vm.castaserver.com> howto add a section to the browser ---------------------------------- Key: HREPTWO-3938 URL: http://issues.onehippo.com/browse/HREPTWO-3938 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Vivek Kumar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:15:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:20:08 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3939) howto skin the cms (images / colors) Message-ID: <11178570.7263.1267780550513.JavaMail.jira@jira.vm.castaserver.com> howto skin the cms (images / colors) ------------------------------------ Key: HREPTWO-3939 URL: http://issues.onehippo.com/browse/HREPTWO-3939 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Vivek Kumar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:19:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:24:01 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3936) howto setup authorization on folders In-Reply-To: <8089535.7251.1267780310341.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17142994.7271.1267780790371.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3936?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vivek Kumar updated HREPTWO-3936: --------------------------------- Description: how to enable/disable folders for groups / roles / users - setting up the template was:how to enable/disable folders for groups / roles / users > howto setup authorization on folders > ------------------------------------ > > Key: HREPTWO-3936 > URL: http://issues.onehippo.com/browse/HREPTWO-3936 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > > how to enable/disable folders for groups / roles / users > - setting up the template -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:21:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:26:00 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3940) how to assign roles to users and/or groups Message-ID: <3944610.7275.1267780910347.JavaMail.jira@jira.vm.castaserver.com> how to assign roles to users and/or groups ------------------------------------------ Key: HREPTWO-3940 URL: http://issues.onehippo.com/browse/HREPTWO-3940 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Vivek Kumar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 10:27:50 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Fri Mar 5 10:32:01 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3941) howto add translations for document types Message-ID: <31487661.7282.1267781270421.JavaMail.jira@jira.vm.castaserver.com> howto add translations for document types ----------------------------------------- Key: HREPTWO-3941 URL: http://issues.onehippo.com/browse/HREPTWO-3941 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Vivek Kumar -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 11:57:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 5 12:02:01 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3942) security improvements RDMP-219 Message-ID: <29228475.7398.1267786670338.JavaMail.jira@jira.vm.castaserver.com> security improvements RDMP-219 ------------------------------ Key: HREPTWO-3942 URL: http://issues.onehippo.com/browse/HREPTWO-3942 Project: Hippo Repository 2 Issue Type: Improvement Affects Versions: r2.12.06 Reporter: Berry van Halderen Assignee: Berry van Halderen Priority: Top Fix For: r2.12.07, r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 11:57:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 5 12:02:03 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3943) escape logging servlet output Message-ID: <16304944.7399.1267786670389.JavaMail.jira@jira.vm.castaserver.com> escape logging servlet output ----------------------------- Key: HREPTWO-3943 URL: http://issues.onehippo.com/browse/HREPTWO-3943 Project: Hippo Repository 2 Issue Type: Sub-task Affects Versions: r2.12.06 Reporter: Berry van Halderen Assignee: Berry van Halderen Fix For: r2.12.07, r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 11:57:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 5 12:02:04 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3944) document administration servlets in use Message-ID: <19612796.7402.1267786670439.JavaMail.jira@jira.vm.castaserver.com> document administration servlets in use --------------------------------------- Key: HREPTWO-3944 URL: http://issues.onehippo.com/browse/HREPTWO-3944 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Berry van Halderen Assignee: Berry van Halderen -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 12:01:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 5 12:06:02 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3945) check mime type upon image upload Message-ID: <425081.7404.1267786910307.JavaMail.jira@jira.vm.castaserver.com> check mime type upon image upload --------------------------------- Key: HREPTWO-3945 URL: http://issues.onehippo.com/browse/HREPTWO-3945 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Berry van Halderen Assignee: Berry van Halderen -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 12:01:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 5 12:06:04 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3946) check mime type when editing image/asset Message-ID: <29773653.7407.1267786910387.JavaMail.jira@jira.vm.castaserver.com> check mime type when editing image/asset ---------------------------------------- Key: HREPTWO-3946 URL: http://issues.onehippo.com/browse/HREPTWO-3946 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Berry van Halderen -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 12:03:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 5 12:08:01 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3945) check mime type upon image/asset upload In-Reply-To: <425081.7404.1267786910307.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <4620116.7409.1267787030348.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3945?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3945: ---------------------------------------- Summary: check mime type upon image/asset upload (was: check mime type upon image upload) > check mime type upon image/asset upload > --------------------------------------- > > Key: HREPTWO-3945 > URL: http://issues.onehippo.com/browse/HREPTWO-3945 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Berry van Halderen > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 12:03:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 5 12:08:03 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3947) dashboard plugin label encoding Message-ID: <10311433.7408.1267787030293.JavaMail.jira@jira.vm.castaserver.com> dashboard plugin label encoding ------------------------------- Key: HREPTWO-3947 URL: http://issues.onehippo.com/browse/HREPTWO-3947 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Berry van Halderen Assignee: Berry van Halderen -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 12:41:50 2010 From: helpdesk at onehippo.com (JIRA (Vijay Kiran)) Date: Fri Mar 5 12:46:01 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3939) howto skin the cms (images / colors) In-Reply-To: <11178570.7263.1267780550513.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <19709022.7427.1267789310452.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3939?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85726#action_85726 ] Vijay Kiran commented on HREPTWO-3939: -------------------------------------- I thought its already there - http://www.onehippo.org/cms7/documentation/development/extending+CMS7/user+interface/customize+skin.html > howto skin the cms (images / colors) > ------------------------------------ > > Key: HREPTWO-3939 > URL: http://issues.onehippo.com/browse/HREPTWO-3939 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 5 14:34:36 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Fri Mar 5 14:38:48 2010 Subject: [HippoRepos-dev] [22035] hippo-ecm: HREPTWO-3943: escape logger names in html Message-ID: <20100305133436.13CD11C020@svn.vm.castaserver.com> Revision: 22035 Author: bvanhalderen Date: 2010-03-05 14:34:35 +0100 (Fri, 05 Mar 2010) Log Message: ----------- HREPTWO-3943: escape logger names in html Modified Paths: -------------- hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/LoggingServlet.java Modified: hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/LoggingServlet.java =================================================================== --- hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/LoggingServlet.java 2010-03-05 01:06:49 UTC (rev 22034) +++ hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/LoggingServlet.java 2010-03-05 13:34:35 UTC (rev 22035) @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,6 +110,7 @@ writer.println("Logger: "); for (Iterator iter = loggerLevelMap.keySet().iterator(); iter.hasNext();) { String loggerName = iter.next(); + loggerName = StringEscapeUtils.escapeHtml(loggerName); writer.println(""); } @@ -141,8 +143,11 @@ writer.println(" loggerlevel"); for (Iterator> iter = loggerLevelMap.entrySet().iterator(); iter.hasNext();) { Map.Entry logMap = iter.next(); - writer.println(" " + logMap.getKey() + "" + logMap.getValue() - + ""); + writer.print(" "); + writer.print(StringEscapeUtils.escapeHtml(logMap.getKey())); + writer.print(""); + writer.print(logMap.getValue()); + writer.println(""); } writer.println(" "); } Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 From helpdesk at onehippo.com Fri Mar 5 14:54:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 5 14:59:01 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3948) Show user names in the Revision History dialog Message-ID: <14331430.7533.1267797290445.JavaMail.jira@jira.vm.castaserver.com> Show user names in the Revision History dialog ---------------------------------------------- Key: HREPTWO-3948 URL: http://issues.onehippo.com/browse/HREPTWO-3948 Project: Hippo Repository 2 Issue Type: Improvement Environment: n/a Reporter: Sylvain P?lissier Attachments: adv_revision_history_dlg.png https://issues.onehippo.com/browse/SDUPRAKTIJKONLINES-454 It would valuable to see the name of the user and the action that was performed under the Revision History dialog. Pls, find attached an example that you may want to use as a starting point... -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 17:13:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 5 17:18:02 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3949) Link Picker in Mozilla Firefox - invisible document in a deeply nested folder structure Message-ID: <14189528.7626.1267805630570.JavaMail.jira@jira.vm.castaserver.com> Link Picker in Mozilla Firefox - invisible document in a deeply nested folder structure --------------------------------------------------------------------------------------- Key: HREPTWO-3949 URL: http://issues.onehippo.com/browse/HREPTWO-3949 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.13.00 Reporter: Sylvain P?lissier STEPS (to be performed with Firefox, then with Internet Explorer): ------ - add the following structure under Documents: (screen0) myfolder \_myfolder0 \_myfolder1 \_myfolder2 \_myfolder3 \_myfolder4 \_myfolder5 \_myfolder6 \_myfolder7 \_mydoc - edit mynews1 - click [...] within Link - try to select mydoc (first by clicking the folders in the treeview TV, then by clicking the folders in the listview LV) You will notice that it is impossible to link to mydoc under Firefox, no matter how you reach it TV/LV. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 17:13:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 5 17:18:03 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3949) Link Picker in Mozilla Firefox - invisible document in a deeply nested folder structure In-Reply-To: <14189528.7626.1267805630570.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <342255.7633.1267805630679.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3949?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85760#action_85760 ] Sylvain P?lissier commented on HREPTWO-3949: -------------------------------------------- https://issues.onehippo.com/browse/SDUPRAKTIJKONLINES-460 > Link Picker in Mozilla Firefox - invisible document in a deeply nested folder structure > --------------------------------------------------------------------------------------- > > Key: HREPTWO-3949 > URL: http://issues.onehippo.com/browse/HREPTWO-3949 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.13.00 > Reporter: Sylvain P?lissier > > STEPS (to be performed with Firefox, then with Internet Explorer): > ------ > - add the following structure under Documents: (screen0) > myfolder > \_myfolder0 > \_myfolder1 > \_myfolder2 > \_myfolder3 > \_myfolder4 > \_myfolder5 > \_myfolder6 > \_myfolder7 > \_mydoc > - edit mynews1 > - click [...] within Link > - try to select mydoc (first by clicking the folders in the treeview TV, then by clicking the folders in the listview LV) > You will notice that it is impossible to link to mydoc under Firefox, no matter how you reach it TV/LV. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 5 17:21:50 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 5 17:26:02 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3950) No wrapping of the breadcrumb along the Link Picker dialogs border in Internet Explorer Message-ID: <17045026.7640.1267806110606.JavaMail.jira@jira.vm.castaserver.com> No wrapping of the breadcrumb along the Link Picker dialogs border in Internet Explorer --------------------------------------------------------------------------------------- Key: HREPTWO-3950 URL: http://issues.onehippo.com/browse/HREPTWO-3950 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.13.00 Environment: n/a Reporter: Sylvain P?lissier Attachments: breadcrumb_wrapping.png See also http://issues.onehippo.com/browse/HREPTWO-3949. On the attached screenshot one notices that the breadcrumb is treated differently depending on the type of browser that is used. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Sat Mar 6 20:57:49 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Sat Mar 6 21:02:04 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3951) Set wicketpath attribute on Wicket elements Message-ID: <10677984.32.1267905469811.JavaMail.jira@jira.vm.castaserver.com> Set wicketpath attribute on Wicket elements ------------------------------------------- Key: HREPTWO-3951 URL: http://issues.onehippo.com/browse/HREPTWO-3951 Project: Hippo Repository 2 Issue Type: New Feature Reporter: Frank van Lankvelt Assignee: Frank van Lankvelt Allow the generation of the wicketpath attribute, as made possible by http://issues.apache.org/jira/browse/WICKET-1830 . This should be configurable, e.g. with an "output.wicketpath" initialization parameter in the application's web.xml. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 08:55:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 09:00:09 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3360) HTML without formatting shown in preview in document editor In-Reply-To: <10388325.107111257779535966.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <13146828.39.1268034948875.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3360?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85788#action_85788 ] Stephan Westen commented on HREPTWO-3360: ----------------------------------------- Odd; looks like the fix for version is lost, from the history of this issue: Fix Version/s r2.11.00 [ 13577 ] > HTML without formatting shown in preview in document editor > ----------------------------------------------------------- > > Key: HREPTWO-3360 > URL: http://issues.onehippo.com/browse/HREPTWO-3360 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Arthur Bogaart > Priority: High > Attachments: screenshot-1.jpg > > Original Estimate: 0 minutes > Remaining Estimate: 0 minutes > > A RTE field with formatting like bullets, numbering, etc is shown without formatting in 'preview' mode. > Use the xinha CSS in preview mode for the RTE parts (!). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 08:59:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 09:04:08 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3360) HTML without formatting shown in preview in document editor In-Reply-To: <10388325.107111257779535966.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <9466139.42.1268035188611.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3360?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3360: ------------------------------------ Fix Version/s: r2.11.01 > HTML without formatting shown in preview in document editor > ----------------------------------------------------------- > > Key: HREPTWO-3360 > URL: http://issues.onehippo.com/browse/HREPTWO-3360 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Arthur Bogaart > Priority: High > Fix For: r2.11.01 > > Attachments: screenshot-1.jpg > > Original Estimate: 0 minutes > Remaining Estimate: 0 minutes > > A RTE field with formatting like bullets, numbering, etc is shown without formatting in 'preview' mode. > Use the xinha CSS in preview mode for the RTE parts (!). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 8 10:03:49 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 8 10:08:11 2010 Subject: [HippoRepos-dev] [22037] hippo-ecm: HREPTWO-3951: use output-wicketpaths parameter to enable wicketpath output Message-ID: <20100308090349.9F7251C020@svn.vm.castaserver.com> Revision: 22037 Author: fvlankvelt Date: 2010-03-08 10:03:49 +0100 (Mon, 08 Mar 2010) Log Message: ----------- HREPTWO-3951: use output-wicketpaths parameter to enable wicketpath output Modified Paths: -------------- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java 2010-03-05 13:39:13 UTC (rev 22036) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/Main.java 2010-03-08 09:03:49 UTC (rev 22037) @@ -82,6 +82,7 @@ public final static String MAXUPLOAD_PARAM = "upload-limit"; public final static String PLUGIN_APPLICATION_NAME = "config"; public final static String ENCRYPT_URLS = "encrypt-urls"; + public final static String OUTPUT_WICKETPATHS = "output-wicketpaths"; @Override protected void init() { @@ -294,6 +295,11 @@ // don't show exception page getExceptionSettings().setUnexpectedExceptionDisplay(IExceptionSettings.SHOW_NO_EXCEPTION_PAGE); } + + String outputWicketpaths = getInitParameter(OUTPUT_WICKETPATHS); + if (outputWicketpaths != null && "true".equalsIgnoreCase(outputWicketpaths)) { + getDebugSettings().setOutputComponentPath(true); + } } @Override From helpdesk at onehippo.com Mon Mar 8 10:05:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Mon Mar 8 10:10:09 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3951) Set wicketpath attribute on Wicket elements In-Reply-To: <10677984.32.1267905469811.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29048655.108.1268039148668.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3951?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85801#action_85801 ] Frank van Lankvelt commented on HREPTWO-3951: --------------------------------------------- The parameter has become "output-wicketpaths"; set it to "true" to have the CMS generate wicketpath attributes in the markup. > Set wicketpath attribute on Wicket elements > ------------------------------------------- > > Key: HREPTWO-3951 > URL: http://issues.onehippo.com/browse/HREPTWO-3951 > Project: Hippo Repository 2 > Issue Type: New Feature > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > > Allow the generation of the wicketpath attribute, as made possible by http://issues.apache.org/jira/browse/WICKET-1830 . This should be configurable, e.g. with an "output.wicketpath" initialization parameter in the application's web.xml. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 10:41:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 10:46:09 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3948) Show user names in the Revision History dialog In-Reply-To: <14331430.7533.1267797290445.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3224482.144.1268041308639.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3948?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3948: ------------------------------------ Fix Version/s: r2.13.00 Priority: Low (was: Normal) Consider this as part of compare revision feature. > Show user names in the Revision History dialog > ---------------------------------------------- > > Key: HREPTWO-3948 > URL: http://issues.onehippo.com/browse/HREPTWO-3948 > Project: Hippo Repository 2 > Issue Type: Improvement > Environment: n/a > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Priority: Low > Fix For: r2.13.00 > > Attachments: adv_revision_history_dlg.png > > > https://issues.onehippo.com/browse/SDUPRAKTIJKONLINES-454 > It would valuable to see the name of the user and the action that was performed under the Revision History dialog. > Pls, find attached an example that you may want to use as a starting point... -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 10:47:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 10:52:08 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3952) When a part of a document contains incorrect HTML and the document is saved, no error message is shown and the document is *not* saved. Message-ID: <10485652.163.1268041668619.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3952?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3952: ------------------------------------ Assignee: Arthur Bogaart (was: Stephan Westen) Fix Version/s: r2.13.00 Priority: High (was: Normal) > When a part of a document contains incorrect HTML and the document is saved, no error message is shown and the document is *not* saved. > --------------------------------------------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3952 > URL: http://issues.onehippo.com/browse/HREPTWO-3952 > Project: Hippo Repository 2 > Issue Type: Improvement > Components: user experience > Affects Versions: r2.06.17, r2.09.07, r2.12.06 > Reporter: Wouter Pasman > Assignee: Arthur Bogaart > Priority: High > Fix For: r2.13.00 > > > See the error message below. The incorrect HTML is probably the result of migrated content. > Note that this error could only be fixed when a user can edit the HTML directly. > The user should be informed of the incorrect HTML and that the article will not or cannot be saved. > 16.11.2009 15:19:41 ERROR [org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin$5.setObject():320] Exception caught during editor creation while cleaning value: >
  • some item
    • >
  • some other item
    • >
  • and another item
    • > org.xml.sax.SAXException: Element "li" is disallowed at its current location, and could not automatically fix this. > at nl.hippo.htmlcleaner.HtmlRepairer$Cleaner.structuralCleanup(HtmlRepairer.java:482) > at nl.hippo.htmlcleaner.HtmlRepairer$Cleaner.clean(HtmlRepairer.java:138) > at nl.hippo.htmlcleaner.HtmlRepairer$Cleaner.access$000(HtmlRepairer.java:107) > at nl.hippo.htmlcleaner.HtmlRepairer.clean(HtmlRepairer.java:104) > at nl.hippo.htmlcleaner.HtmlCleaner.clean(HtmlCleaner.java:51) > at nl.hippo.htmlcleaner.HtmlCleaner.cleanToString(HtmlCleaner.java:62) > at org.hippoecm.frontend.plugins.xinha.htmlcleaner.HtmlCleanerPlugin.clean(HtmlCleanerPlugin.java:60) > at org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin.clean(AbstractXinhaPlugin.java:299) > at org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin$5.setObject(AbstractXinhaPlugin.java:316) > at org.apache.wicket.Component.setModelObject(Component.java:2889) > at org.apache.wicket.markup.html.form.FormComponent.updateModel(FormComponent.java:1069) > at org.apache.wicket.markup.html.form.FormComponent.processInput(FormComponent.java:951) > at org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin$7.handleRequest(AbstractXinhaPlugin.java:381) > at org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin$7$1.respond(AbstractXinhaPlugin.java:368) > at org.apache.wicket.request.AbstractRequestCycleProcessor.respond(AbstractRequestCycleProcessor.java:104) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1181) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1252) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1353) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:493) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:355) > at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:200) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:849) > at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:454) > at java.lang.Thread.run(Thread.java:619) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 12:51:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Mon Mar 8 12:56:09 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3870) State not properly cleared after removing facet search node In-Reply-To: <20485414.826.1266969290360.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <16101697.393.1268049108692.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3870?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85862#action_85862 ] Bart van der Schans commented on HREPTWO-3870: ---------------------------------------------- So can we close this issue as "won't fix"? > State not properly cleared after removing facet search node > ----------------------------------------------------------- > > Key: HREPTWO-3870 > URL: http://issues.onehippo.com/browse/HREPTWO-3870 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Bart van der Schans > Assignee: Berry van Halderen > Priority: High > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 13:17:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Mon Mar 8 13:22:08 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3953) Consolidate CMS plugin structure Message-ID: <12972930.423.1268050668480.JavaMail.jira@jira.vm.castaserver.com> Consolidate CMS plugin structure -------------------------------- Key: HREPTWO-3953 URL: http://issues.onehippo.com/browse/HREPTWO-3953 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Frank van Lankvelt Assignee: Frank van Lankvelt Fix For: r2.13.00 Reduce the number of plugins and the amount of configuration that is necessary for the CMS. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 8 13:22:58 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 8 13:27:19 2010 Subject: [HippoRepos-dev] [22038] hippo-ecm: HREPTWO-3923: fix typo Message-ID: <20100308122258.44E2C1C020@svn.vm.castaserver.com> Revision: 22038 Author: fvlankvelt Date: 2010-03-08 13:22:57 +0100 (Mon, 08 Mar 2010) Log Message: ----------- HREPTWO-3923: fix typo Modified Paths: -------------- hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml 2010-03-08 09:03:49 UTC (rev 22037) +++ hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml 2010-03-08 12:22:57 UTC (rev 22038) @@ -189,7 +189,7 @@ Name     - hippo:facetsubsearch + hipposys:facetsubsearch     From svn-logs at hippocms.org Mon Mar 8 13:26:54 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 8 13:31:16 2010 Subject: [HippoRepos-dev] [22039] hippo-ecm/trunk: HREPTWO-3953: remove layout plugins from cms-static Message-ID: <20100308122654.877A61C020@svn.vm.castaserver.com> Revision: 22039 Author: fvlankvelt Date: 2010-03-08 13:26:53 +0100 (Mon, 08 Mar 2010) Log Message: ----------- HREPTWO-3953: remove layout plugins from cms-static Work in progress; goal is to remove as much as possible of the configuration, moving the wireframes configuration into java classes, only to be overridden for customization. Modified Paths: -------------- hippo-ecm/trunk/addon/cms/admin/pom.xml hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.java hippo-ecm/trunk/addon/cms/root/pom.xml hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/RememberMeLoginPlugin.java hippo-ecm/trunk/package/auth/src/main/resources/domain-frontendconfig.xml hippo-ecm/trunk/package/config/src/main/resources/cms-login.xml hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml Added Paths: ----------- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/BrowserSpecificStylesheetsBehavior.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/BrowserCheckBehavior.java hippo-ecm/trunk/frontend/plugins/src/test/java/org/hippoecm/frontend/plugins/login/BrowserTest.java Removed Paths: ------------- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/behaviors/ hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/browsercheck/BrowserTest.java hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/cms/management/ hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/cms/root/ hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin_vertical.html Modified: hippo-ecm/trunk/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/trunk/addon/cms/admin/pom.xml 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/admin/pom.xml 2010-03-08 12:26:53 UTC (rev 22039) @@ -61,6 +61,11 @@ hippo-ecm-addon-standards-frontend 2.13.00-SNAPSHOT     + + org.hippoecm + hippo-ecm-addon-yui + 2.13.00-SNAPSHOT + org.hippoecm Modified: hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.java =================================================================== --- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.java 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -18,12 +18,13 @@ import org.apache.wicket.extensions.breadcrumb.BreadCrumbBar; import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener; import org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant; -import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.hippoecm.frontend.dialog.IDialogService; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.cms.admin.crumbs.AdminBreadCrumbBar; import org.hippoecm.frontend.plugins.standards.perspective.Perspective; +import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; +import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; public class AdminPerspective extends Perspective { @SuppressWarnings("unused") @@ -60,6 +61,8 @@ redraw(); } }); + + add(new WireframeBehavior(new WireframeSettings(config.getPluginConfig("layout.wireframe")))); } public void showDialog(IDialogService.Dialog dialog) { Modified: hippo-ecm/trunk/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/trunk/addon/cms/root/pom.xml 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/root/pom.xml 2010-03-08 12:26:53 UTC (rev 22039) @@ -61,6 +61,11 @@ org.hippoecm + hippo-ecm-addon-standards-frontend + 2.13.00-SNAPSHOT + + + org.hippoecm hippo-ecm-addon-yui 2.13.00-SNAPSHOT Copied: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/BrowserSpecificStylesheetsBehavior.java (from rev 22013, hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/behaviors/BrowserSpecificStylesheetsBehavior.java) =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/BrowserSpecificStylesheetsBehavior.java (rev 0) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/BrowserSpecificStylesheetsBehavior.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -0,0 +1,133 @@ +/* + * 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.root; + +import org.apache.wicket.IClusterable; +import org.apache.wicket.RequestCycle; +import org.apache.wicket.behavior.HeaderContributor; +import org.apache.wicket.markup.html.IHeaderContributor; +import org.apache.wicket.markup.html.IHeaderResponse; +import org.apache.wicket.protocol.http.request.WebClientInfo; +import org.apache.wicket.request.ClientInfo; +import org.hippoecm.frontend.service.render.HeaderContributorHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class BrowserSpecificStylesheetsBehavior extends HeaderContributor { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + static final Logger log = LoggerFactory.getLogger(BrowserSpecificStylesheetsBehavior.class); + + public BrowserSpecificStylesheetsBehavior(final StylesheetConfiguration... configurations) { + super(new IHeaderContributor() { + private static final long serialVersionUID = 1L; + + public void renderHead(IHeaderResponse response) { + Browser userBrowser = getBrowser(); + if (userBrowser != null && userBrowser.userAgent != UserAgent.UNSUPPORTED) { + for (StylesheetConfiguration ssc : configurations) { + if (loadStylesheets(userBrowser, ssc)) { + for (String location : ssc.styleSheets) { + //TODO: add rel/abs path option + response.renderCSSReference(HeaderContributorHelper.returnFixedRelativePath(location)); + } + } + } + } + } + + private boolean loadStylesheets(Browser userBrowser, StylesheetConfiguration conf) { + if (userBrowser.userAgent != conf.browser.userAgent) { + return false; + } + if (conf.browser.majorVersion > -1 && conf.browser.majorVersion != userBrowser.majorVersion) { + return false; + } + if (conf.browser.minorVersion > -1 && conf.browser.minorVersion != userBrowser.minorVersion) { + return false; + } + return true; + } + + private Browser getBrowser() { + ClientInfo info = RequestCycle.get().getClientInfo(); + if (info instanceof WebClientInfo) { + return new Browser((WebClientInfo) info); + } + return null; + } + }); + } + + public static class StylesheetConfiguration implements IClusterable { + private static final long serialVersionUID = 1L; + + Browser browser; + String[] styleSheets; + + public StylesheetConfiguration(Browser browser, String... styleSheets) { + this.browser = browser; + this.styleSheets = styleSheets; + } + + } + + public static enum UserAgent { + IE, FIREFOX, SAFARI, OPERA, UNSUPPORTED + }; + + public static class Browser implements IClusterable { + private static final long serialVersionUID = 1L; + + UserAgent userAgent; + int majorVersion = -1; + int minorVersion = -1; + + public Browser(WebClientInfo webInfo) { + majorVersion = webInfo.getProperties().getBrowserVersionMajor(); + minorVersion = webInfo.getProperties().getBrowserVersionMinor(); + + if (webInfo.getProperties().isBrowserInternetExplorer()) { + userAgent = UserAgent.IE; + } else if (webInfo.getProperties().isBrowserMozillaFirefox()) { + userAgent = UserAgent.FIREFOX; + } else if (webInfo.getProperties().isBrowserSafari()) { + userAgent = UserAgent.SAFARI; + } else if (webInfo.getProperties().isBrowserOpera()) { + userAgent = UserAgent.OPERA; + } else { + userAgent = UserAgent.UNSUPPORTED; + } + } + + public Browser(UserAgent ua) { + userAgent = ua; + } + + public Browser(UserAgent ua, int major) { + this(ua); + majorVersion = major; + } + + public Browser(UserAgent ua, int major, int minor) { + this(ua, major); + minorVersion = minor; + } + } +} Property changes on: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/BrowserSpecificStylesheetsBehavior.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.html 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.html 2010-03-08 12:26:53 UTC (rev 22039) @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.java 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/FooterPlugin.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -1,32 +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.cms.root; - -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.service.render.RenderPlugin; - -public class FooterPlugin extends RenderPlugin { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - public FooterPlugin(IPluginContext context, IPluginConfig config) { - super(context, config); - } - -} Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.html 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.html 2010-03-08 12:26:53 UTC (rev 22039) @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.java 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/HeaderPlugin.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -1,32 +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.cms.root; - -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.service.render.RenderPlugin; - -public class HeaderPlugin extends RenderPlugin { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - public HeaderPlugin(IPluginContext context, IPluginConfig config) { - super(context, config); - } - -} Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-08 12:26:53 UTC (rev 22039) @@ -1,23 +0,0 @@ - - - - Hippo CMS 7 - - -
    [Prevents session timeouts]
    -     - Copied: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html (from rev 22013, hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html) =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html (rev 0) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-08 12:26:53 UTC (rev 22039) @@ -0,0 +1,66 @@ + + + + Hippo CMS 7 + + + +
    +
    +
    +
    + Hippo CMS 7 +
    logout
    +
    +
    +
    shortcuts here
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    [panel]
    +
    +
    +
    +
    +
    +
    +
    +
    +
    [Prevents session timeouts]
    +     + Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -15,18 +15,26 @@ */ package org.hippoecm.frontend.plugins.cms.root; +import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.PluginRequestTarget; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugins.cms.root.BrowserSpecificStylesheetsBehavior.Browser; +import org.hippoecm.frontend.plugins.cms.root.BrowserSpecificStylesheetsBehavior.StylesheetConfiguration; +import org.hippoecm.frontend.plugins.cms.root.BrowserSpecificStylesheetsBehavior.UserAgent; +import org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin; import org.hippoecm.frontend.plugins.yui.ajax.AjaxIndicatorBehavior; import org.hippoecm.frontend.plugins.yui.layout.PageLayoutBehavior; import org.hippoecm.frontend.plugins.yui.layout.PageLayoutSettings; +import org.hippoecm.frontend.plugins.yui.layout.UnitBehavior; +import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; +import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; +import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; -import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.widgets.Pinger; -public class RootPlugin extends RenderPlugin { +public class RootPlugin extends TabsPlugin { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -39,12 +47,38 @@ add(new Pinger("pinger")); - PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("yui.config")); + PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("layout.page")); add(new PageLayoutBehavior(plSettings)); add(new AjaxIndicatorBehavior()); + + String[] browsers = config.getStringArray("browsers"); + StylesheetConfiguration[] configurations = new StylesheetConfiguration[browsers.length]; + for (int i = 0; i < browsers.length; i++) { + if (config.containsKey(browsers[i])) { + IPluginConfig browserConf = config.getPluginConfig(browsers[i]); + String ua = browserConf.getString("user.agent", "unsupported").toUpperCase(); + Browser browser = new Browser(UserAgent.valueOf(ua), browserConf.getInt("major.version", -1), + browserConf.getInt("minor.version", -1)); + + configurations[i] = new StylesheetConfiguration(browser, browserConf.getStringArray("stylesheets")); + } + } + add(new BrowserSpecificStylesheetsBehavior(configurations)); + + get("tabs").add(new WireframeBehavior(new WireframeSettings(config.getPluginConfig("layout.wireframe")))); + get("tabs:panel-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.panel")))); + get("tabs:tabs-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.tabs")))); } + static UnitSettings createSettings(IPluginConfig config) { + if (config.containsKey("options")) { + return new UnitSettings(config.getString("position"), new ValueMap(config.getString("options"))); + } else { + return new UnitSettings(config); + } + } + @Override public void render(PluginRequestTarget target) { if (!rendered) { Deleted: hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/browsercheck/BrowserTest.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/browsercheck/BrowserTest.java 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/browsercheck/BrowserTest.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -1,202 +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.standards.browsercheck; - -import org.hippoecm.frontend.plugins.standards.behaviors.BrowserCheckPlugin.BrowserCheck; -import org.hippoecm.frontend.plugins.standards.behaviors.BrowserCheckPlugin.BrowserInfo; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -public class BrowserTest { - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - static final TestBrowserInfo IE6 = new TestBrowserInfo("ie", 6, -1); - static final TestBrowserInfo IE7 = new TestBrowserInfo("ie", 7, -1); - static final TestBrowserInfo IE8 = new TestBrowserInfo("ie", 8, -1); - - static final TestBrowserInfo FF = new TestBrowserInfo("firefox", -1, -1); - static final TestBrowserInfo FF3 = new TestBrowserInfo("firefox", 3, -1); - static final TestBrowserInfo FF35 = new TestBrowserInfo("firefox", 3, 5); - - static final TestBrowserInfo SAFARI = new TestBrowserInfo("safari", -1, -1); - static final TestBrowserInfo SAFARI3 = new TestBrowserInfo("safari", 3, -1); - static final TestBrowserInfo SAFARI4 = new TestBrowserInfo("safari", 4, -1); - - static final TestBrowserInfo UNKNOWN = new TestBrowserInfo("unknown", -1, -1); - - @Test - public void testNoUnsupported() throws Exception { - checkFalse(new BrowserCheck(new String[] { }), IE6, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - } - - @Test - public void testNoVersion() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "ie" }); - checkTrue(check, IE6, IE7, IE8); - checkFalse(check,FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - } - - @Test - public void testNoVersionMultiple() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "ie", "firefox" }); - checkTrue(check, IE6, IE7, IE8, FF, FF3, FF35); - checkFalse(check, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - } - - @Test - public void testVersionMajor() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "ie 6" }); - checkTrue(check, IE6); - checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 7" }); - checkTrue(check, IE7); - checkFalse(check, IE6, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - } - - @Test - public void testVersionMajorMinor() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "firefox 3.5" }); - checkTrue(check, FF35); - checkFalse(check, IE6, IE7, IE8, FF, FF3, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - } - - @Test - public void testVersionMajorMultiple() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "ie 6", "firefox 3.5" }); - checkTrue(check, IE6, FF35); - checkFalse(check, IE7, IE8, FF, FF3, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 7", "ie 8", "safari 4" }); - checkTrue(check, IE7, IE8, SAFARI4); - checkFalse(check, IE6, FF, FF3, FF35, SAFARI, SAFARI3, UNKNOWN); - } - - @Test - public void testVersionAndModifier() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "ie 6 =" }); - checkTrue(check, IE6); - checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 6 >" }); - checkTrue(check, IE7, IE8); - checkFalse(check, IE6, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 6 >=" }); - checkTrue(check, IE6, IE7, IE8); - checkFalse(check, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 7 <" }); - checkTrue(check, IE6); - checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 7 <=" }); - checkTrue(check, IE6, IE7); - checkFalse(check, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - } - - @Test - public void testVersionAndModifierMultiple() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "ie 6 =", "firefox" }); - checkTrue(check, IE6, FF, FF3, FF35); - checkFalse(check, IE7, IE8, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 6 >" }); - checkTrue(check, IE7, IE8); - checkFalse(check, IE6, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 6 >=" }); - checkTrue(check, IE6, IE7, IE8); - checkFalse(check, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 7 <" }); - checkTrue(check, IE6); - checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - - check = new BrowserCheck(new String[] { "ie 7 <=" }); - checkTrue(check, IE6, IE7); - checkFalse(check, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); - } - - @Test - public void testComplex() throws Exception { - BrowserCheck check = new BrowserCheck(new String[] { "ie 7 <=", "firefox 3.5", "safari" }); - checkTrue(check, IE6, IE7, FF35, SAFARI, SAFARI3, SAFARI4); - checkFalse(check, IE8, FF, FF3, UNKNOWN); - - } - - private void checkFalse(BrowserCheck check, TestBrowserInfo... infos) { - for(TestBrowserInfo info : infos) { - assertFalse(check.isSupported(info)); - } - } - - private void checkTrue(BrowserCheck check, TestBrowserInfo... infos) { - for(TestBrowserInfo info : infos) { - assertTrue(check.isSupported(info)); - } - } - - static class TestBrowserInfo implements BrowserInfo { - - int major = -1; - int minor = -1; - String agent = ""; - - public TestBrowserInfo(String agent, int major, int minor) { - this.agent = agent; - this.minor = minor; - this.major = major; - } - - public int getMajor() { - return major; - } - - public int getMinor() { - return minor; - } - - public boolean isChrome() { - return agent.equals("chrome"); - } - - public boolean isFirefox() { - return agent.equals("firefox"); - } - - public boolean isInternetExplorer() { - return agent.equals("ie"); - } - - public boolean isOpera() { - return agent.equals("opera"); - } - - public boolean isSafari() { - return agent.equals("safari"); - } - - } - -} Copied: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/BrowserCheckBehavior.java (from rev 22013, hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/behaviors/BrowserCheckPlugin.java) =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/BrowserCheckBehavior.java (rev 0) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/BrowserCheckBehavior.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -0,0 +1,267 @@ +/* + * 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.login; + +import java.util.StringTokenizer; + +import org.apache.wicket.Component; +import org.apache.wicket.IClusterable; +import org.apache.wicket.RequestCycle; +import org.apache.wicket.behavior.AbstractBehavior; +import org.apache.wicket.model.StringResourceModel; +import org.apache.wicket.protocol.http.request.WebClientInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class BrowserCheckBehavior extends AbstractBehavior { + private static final long serialVersionUID = 1L; + + static Logger log = LoggerFactory.getLogger(BrowserCheckBehavior.class); + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + BrowserCheck check; + + public static class BrowserCheck implements IClusterable { + private static final long serialVersionUID = 1L; + + Browser[] browsers; + + public BrowserCheck(String[] init) { + browsers = new Browser[init.length]; + for (int i = 0; i < browsers.length; i++) { + browsers[i] = new Browser(init[i]); + } + } + + public boolean isSupported(BrowserInfo info) { + for (Browser browser : browsers) { + if (browser.is(info)) { + return true; + } + } + return false; + } + } + + /** + * Supported browsers can be configured like: + * ie 6 <=, safari 4 <, chrome, firefox 3.5 <=, opera + */ + public static class Browser implements IClusterable { + private static final long serialVersionUID = 1L; + + String agent; + int majorVersion = -1; + int minorVersion = -1; + String modifier = "="; + + public Browser(String init) { + StringTokenizer st = new StringTokenizer(init, " "); + + agent = st.nextToken(); + if (st.hasMoreTokens()) { + String major = st.nextToken(), minor = null; + int idx = major.indexOf("."); + if (idx > -1) { + minor = major.substring(idx + 1); + major = major.substring(0, idx); + } + if (major != null) { + majorVersion = new Integer(major); + } + if (minor != null) { + minorVersion = new Integer(minor); + } + } + + if (st.hasMoreTokens()) { + modifier = st.nextToken(); + } + } + + public boolean is(BrowserInfo info) { + if (!isAgent(info)) { + return false; + } + return isVersion(info); + } + + private boolean isVersion(BrowserInfo info) { + if (majorVersion > -1 && !validVersion(majorVersion, info.getMajor())) { + return false; + } + if (minorVersion > -1 && !validVersion(minorVersion, info.getMinor())) { + return false; + } + return true; + } + + private boolean validVersion(int configured, int provided) { + if (modifier.equals("=")) { + return configured == provided; + } else if (modifier.equals("<")) { + return provided < configured; + } else if (modifier.equals("<=")) { + return provided <= configured; + } else if (modifier.equals(">")) { + return provided > configured; + } else if (modifier.equals(">=")) { + return provided >= configured; + } + return false; + } + + private boolean isAgent(BrowserInfo info) { + if (agent.equals("ie")) { + return info.isInternetExplorer(); + } else if (agent.equals("firefox")) { + return info.isFirefox(); + } else if (agent.equals("safari")) { + return info.isSafari(); + } else if (agent.equals("chrome")) { + return info.isChrome(); + } else if (agent.equals("opera")) { + return info.isOpera(); + } + return false; + } + + } + + public static interface BrowserInfo { + + boolean isOpera(); + + boolean isChrome(); + + boolean isSafari(); + + boolean isFirefox(); + + boolean isInternetExplorer(); + + int getMajor(); + + int getMinor(); + } + + public static class WicketBrowserInfo implements BrowserInfo { + + private static final String MSIE = "MSIE"; + private static final String CHROME = "Chrome"; + private static final String SHIRETOKO = "Shiretoko"; + private static final String FIREFOX = "Firefox"; + private WebClientInfo info; + private int major; + private int minor; + + public WicketBrowserInfo(WebClientInfo info) { + this.info = info; + + major = info.getProperties().getBrowserVersionMajor(); + minor = info.getProperties().getBrowserVersionMinor(); + if (major == -1) { + if (isFirefox()) { + if (info.getProperties().isBrowserMozillaFirefox()) { + setVersions(FIREFOX); + } else if (info.getUserAgent().indexOf(SHIRETOKO) > -1) { + setVersions(SHIRETOKO); + } + } else if (isChrome()) { + setVersions(CHROME); + } else if (isSafari() || isOpera()) { + setVersions("Version"); + } else if (isInternetExplorer()) { + String ua = info.getUserAgent(); + if (ua.indexOf(MSIE) > 0) { + String v = ua.substring(ua.indexOf(MSIE)); + parseMajorMinor(v.substring(5, v.indexOf(';'))); + } + } + } + } + + private void setVersions(String string) { + String ua = info.getUserAgent(); + if (ua.indexOf(string) == -1) { + return; + } + parseMajorMinor(ua.substring(ua.indexOf(string) + string.length() + 1)); + } + + private void parseMajorMinor(String parse) { + try { + StringTokenizer st = new StringTokenizer(parse.trim(), ". "); + if (st.hasMoreTokens()) { + major = Integer.parseInt(st.nextToken()); + if (st.hasMoreTokens()) { + minor = Integer.parseInt(st.nextToken()); + } + } + } catch (NumberFormatException ex) { + log.info("Could not parse " + parse + ": " + ex.getMessage()); + } + } + + public boolean isChrome() { + return info.getProperties().isBrowserSafari() && info.getUserAgent().indexOf(CHROME) > -1; + } + + public boolean isFirefox() { + return info.getProperties().isBrowserMozillaFirefox() + || (info.getProperties().isBrowserMozilla() && info.getUserAgent().indexOf(SHIRETOKO) > -1); + } + + public boolean isInternetExplorer() { + return info.getProperties().isBrowserInternetExplorer(); + } + + public boolean isOpera() { + return info.getProperties().isBrowserOpera(); + } + + public boolean isSafari() { + return info.getProperties().isBrowserSafari() && !isChrome(); + } + + public int getMajor() { + return major; + } + + public int getMinor() { + return minor; + } + + } + + public BrowserCheckBehavior(String[] supported) { + check = new BrowserCheck(supported); + } + + @Override + public void bind(Component component) { + super.bind(component); + + WebClientInfo info = (WebClientInfo) RequestCycle.get().getClientInfo(); + if (check != null && !check.isSupported(new WicketBrowserInfo(info))) { + component.info(new StringResourceModel("browser.unsupported.warning", component, null).getString()); + } + } + +} Property changes on: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/BrowserCheckBehavior.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/RememberMeLoginPlugin.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/RememberMeLoginPlugin.java 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/login/RememberMeLoginPlugin.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -63,6 +63,11 @@ public RememberMeLoginPlugin(IPluginContext context, IPluginConfig config) { super(context, config); + + String[] supported = config.getStringArray("browsers.supported"); + if (supported != null) { + add(new BrowserCheckBehavior(supported)); + } } @Override Copied: hippo-ecm/trunk/frontend/plugins/src/test/java/org/hippoecm/frontend/plugins/login/BrowserTest.java (from rev 22013, hippo-ecm/trunk/addon/standards/frontend/src/test/java/org/hippoecm/frontend/plugins/standards/browsercheck/BrowserTest.java) =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/test/java/org/hippoecm/frontend/plugins/login/BrowserTest.java (rev 0) +++ hippo-ecm/trunk/frontend/plugins/src/test/java/org/hippoecm/frontend/plugins/login/BrowserTest.java 2010-03-08 12:26:53 UTC (rev 22039) @@ -0,0 +1,201 @@ +/* + * 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.login; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.hippoecm.frontend.plugins.login.BrowserCheckBehavior.BrowserCheck; +import org.hippoecm.frontend.plugins.login.BrowserCheckBehavior.BrowserInfo; +import org.junit.Test; + +public class BrowserTest { + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + static final TestBrowserInfo IE6 = new TestBrowserInfo("ie", 6, -1); + static final TestBrowserInfo IE7 = new TestBrowserInfo("ie", 7, -1); + static final TestBrowserInfo IE8 = new TestBrowserInfo("ie", 8, -1); + + static final TestBrowserInfo FF = new TestBrowserInfo("firefox", -1, -1); + static final TestBrowserInfo FF3 = new TestBrowserInfo("firefox", 3, -1); + static final TestBrowserInfo FF35 = new TestBrowserInfo("firefox", 3, 5); + + static final TestBrowserInfo SAFARI = new TestBrowserInfo("safari", -1, -1); + static final TestBrowserInfo SAFARI3 = new TestBrowserInfo("safari", 3, -1); + static final TestBrowserInfo SAFARI4 = new TestBrowserInfo("safari", 4, -1); + + static final TestBrowserInfo UNKNOWN = new TestBrowserInfo("unknown", -1, -1); + + @Test + public void testNoUnsupported() throws Exception { + checkFalse(new BrowserCheck(new String[] { }), IE6, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + } + + @Test + public void testNoVersion() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "ie" }); + checkTrue(check, IE6, IE7, IE8); + checkFalse(check,FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + } + + @Test + public void testNoVersionMultiple() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "ie", "firefox" }); + checkTrue(check, IE6, IE7, IE8, FF, FF3, FF35); + checkFalse(check, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + } + + @Test + public void testVersionMajor() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "ie 6" }); + checkTrue(check, IE6); + checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 7" }); + checkTrue(check, IE7); + checkFalse(check, IE6, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + } + + @Test + public void testVersionMajorMinor() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "firefox 3.5" }); + checkTrue(check, FF35); + checkFalse(check, IE6, IE7, IE8, FF, FF3, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + } + + @Test + public void testVersionMajorMultiple() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "ie 6", "firefox 3.5" }); + checkTrue(check, IE6, FF35); + checkFalse(check, IE7, IE8, FF, FF3, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 7", "ie 8", "safari 4" }); + checkTrue(check, IE7, IE8, SAFARI4); + checkFalse(check, IE6, FF, FF3, FF35, SAFARI, SAFARI3, UNKNOWN); + } + + @Test + public void testVersionAndModifier() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "ie 6 =" }); + checkTrue(check, IE6); + checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 6 >" }); + checkTrue(check, IE7, IE8); + checkFalse(check, IE6, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 6 >=" }); + checkTrue(check, IE6, IE7, IE8); + checkFalse(check, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 7 <" }); + checkTrue(check, IE6); + checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 7 <=" }); + checkTrue(check, IE6, IE7); + checkFalse(check, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + } + + @Test + public void testVersionAndModifierMultiple() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "ie 6 =", "firefox" }); + checkTrue(check, IE6, FF, FF3, FF35); + checkFalse(check, IE7, IE8, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 6 >" }); + checkTrue(check, IE7, IE8); + checkFalse(check, IE6, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 6 >=" }); + checkTrue(check, IE6, IE7, IE8); + checkFalse(check, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 7 <" }); + checkTrue(check, IE6); + checkFalse(check, IE7, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + + check = new BrowserCheck(new String[] { "ie 7 <=" }); + checkTrue(check, IE6, IE7); + checkFalse(check, IE8, FF, FF3, FF35, SAFARI, SAFARI3, SAFARI4, UNKNOWN); + } + + @Test + public void testComplex() throws Exception { + BrowserCheck check = new BrowserCheck(new String[] { "ie 7 <=", "firefox 3.5", "safari" }); + checkTrue(check, IE6, IE7, FF35, SAFARI, SAFARI3, SAFARI4); + checkFalse(check, IE8, FF, FF3, UNKNOWN); + + } + + private void checkFalse(BrowserCheck check, TestBrowserInfo... infos) { + for(TestBrowserInfo info : infos) { + assertFalse(check.isSupported(info)); + } + } + + private void checkTrue(BrowserCheck check, TestBrowserInfo... infos) { + for(TestBrowserInfo info : infos) { + assertTrue(check.isSupported(info)); + } + } + + static class TestBrowserInfo implements BrowserInfo { + + int major = -1; + int minor = -1; + String agent = ""; + + public TestBrowserInfo(String agent, int major, int minor) { + this.agent = agent; + this.minor = minor; + this.major = major; + } + + public int getMajor() { + return major; + } + + public int getMinor() { + return minor; + } + + public boolean isChrome() { + return agent.equals("chrome"); + } + + public boolean isFirefox() { + return agent.equals("firefox"); + } + + public boolean isInternetExplorer() { + return agent.equals("ie"); + } + + public boolean isOpera() { + return agent.equals("opera"); + } + + public boolean isSafari() { + return agent.equals("safari"); + } + + } + +} Property changes on: hippo-ecm/trunk/frontend/plugins/src/test/java/org/hippoecm/frontend/plugins/login/BrowserTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: hippo-ecm/trunk/package/auth/src/main/resources/domain-frontendconfig.xml =================================================================== --- hippo-ecm/trunk/package/auth/src/main/resources/domain-frontendconfig.xml 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/package/auth/src/main/resources/domain-frontendconfig.xml 2010-03-08 12:26:53 UTC (rev 22039) @@ -112,26 +112,6 @@ org.hippoecm.frontend.plugins.cms.admin.AdminPerspective - - - hipposys:facetrule - - - false - - - plugin.class - - - false - - - String - - - org.hippoecm.frontend.plugins.cms.management.ManagementPerspective - - hipposys:facetrule Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-login.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-login.xml 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-login.xml 2010-03-08 12:26:53 UTC (rev 22039) @@ -39,18 +39,7 @@ service.behavior.browser.check - - - - frontend:plugin - - - service.behavior.browser.check - - - org.hippoecm.frontend.plugins.standards.behaviors.BrowserCheckPlugin - - + ie 7 >= firefox 3 >= Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-08 12:26:53 UTC (rev 22039) @@ -400,18 +400,18 @@ service.center - - service.header + + service.logout + + service.browse.shortcuts + org.hippoecm.frontend.plugins.cms.root.RootPlugin - - service.behavior.stylesheets - - extension.header - extension.center + extension.logout + extension.shortcuts service.root @@ -419,40 +419,13 @@ skin/screen.css - - - frontend:pluginconfig - - - 0px 0px 0px 0px - - - 0px 0px 0px 0px - - - 50 - - - doc3 - - - - - - - - frontend:plugin - - - service.behavior.stylesheets - - ie + browser.ie - - org.hippoecm.frontend.plugins.standards.behaviors.BrowserSpecificStylesheetsPlugin + + service.tab - + frontend:pluginconfig @@ -463,88 +436,21 @@ ie - - - - - frontend:plugin - - - service.logout - - - service.browse.shortcuts - - - org.hippoecm.frontend.plugins.cms.root.HeaderPlugin - - - extension.logout - extension.shortcuts - - - service.header - - - - - frontend:plugin - - - org.hippoecm.frontend.plugins.standards.tabs.TabsPlugin - - - service.tab - - - service.behavior.center - - - service.center - - - vertical - - - - - frontend:plugin - - - service.behavior.center - - - tabs:panel-container - - - org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - + frontend:pluginconfig - - height=1000 + + 0px 0px 0px 0px - - center + + 0px 0px 0px 0px + + 50 + - - - - frontend:plugin - - - service.behavior.center - - - tabs - - - org.hippoecm.frontend.plugins.yui.layout.WireframePlugin - - + frontend:pluginconfig @@ -565,25 +471,22 @@ center - - - - frontend:plugin - - - service.behavior.center - - - tabs:tabs-container - - - org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - + frontend:pluginconfig + height=1000 + + + center + + + + + frontend:pluginconfig + + width=50 @@ -591,17 +494,6 @@ - - - frontend:plugin - - - org.hippoecm.frontend.plugins.cms.root.FooterPlugin - - - service.footer - - frontend:plugin @@ -686,23 +578,11 @@ service.behavior.tabs - service.behavior.adminlayout service.tab - - - - frontend:plugin - - - service.behavior.adminlayout - - - org.hippoecm.frontend.plugins.yui.layout.WireframePlugin - - + frontend:pluginconfig Deleted: hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin_vertical.html =================================================================== --- hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin_vertical.html 2010-03-08 12:22:57 UTC (rev 22038) +++ hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin_vertical.html 2010-03-08 12:26:53 UTC (rev 22039) @@ -1,42 +0,0 @@ - - - -
    -
    -
    -
    - -
    -
    -
    -
    -
    [panel]
    -
    -
    -
    -
    -     - From helpdesk at onehippo.com Mon Mar 8 13:41:48 2010 From: helpdesk at onehippo.com (JIRA (Jasha Joachimsthal)) Date: Mon Mar 8 13:46:08 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3954) Tabbing through fields skips rich text field Message-ID: <1658058.442.1268052108535.JavaMail.jira@jira.vm.castaserver.com> Tabbing through fields skips rich text field -------------------------------------------- Key: HREPTWO-3954 URL: http://issues.onehippo.com/browse/HREPTWO-3954 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Reporter: Jasha Joachimsthal Assignee: Stefan Schinkel Since 7.3 the Xinha field is not immediately loaded. If you tab between fields, the deactivated rich text field is skipped. Is this a bug or a feature? -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 13:53:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 13:58:08 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3954) Tabbing through fields skips rich text field In-Reply-To: <1658058.442.1268052108535.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <6281526.456.1268052828563.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3954?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3954: ------------------------------------ Assignee: Arthur Bogaart (was: Stefan Schinkel) Fix Version/s: r2.13.00 Description: Since 7.3 the Xinha field is not immediately loaded. If you tab between fields, the deactivated rich text field is skipped. The expected behavior is that the RTE is activated and gets focus. was: Since 7.3 the Xinha field is not immediately loaded. If you tab between fields, the deactivated rich text field is skipped. Is this a bug or a feature? > Tabbing through fields skips rich text field > -------------------------------------------- > > Key: HREPTWO-3954 > URL: http://issues.onehippo.com/browse/HREPTWO-3954 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jasha Joachimsthal > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > > Since 7.3 the Xinha field is not immediately loaded. If you tab between fields, the deactivated rich text field is skipped. The expected behavior is that the RTE is activated and gets focus. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 14:09:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 14:14:08 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3880) Show version information inside CMS In-Reply-To: <16844480.1317.1267018850472.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17078196.525.1268053788533.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3880?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3880: ------------------------------------ Description: This is the follow up on: HREPTWO-3691 A location, design, style and html is needed. >From Stephan: "show versio nr inside the CMS (not too deep please - e.g. not system/admin page)" Please note that showing the version number on the login page (ie also for not authorized users) is assumed to be a security risk (that was the reason of the removal). In this perspective showing the version number to logged in users should be considered as a security risk as well. was: This is the follow up on: HREPTWO-3691 A location, design, style and html is needed. >From Stephan: "show versio nr inside the CMS (not too deep please - e.g. not system/admin page)" Please note that showing the version number is assumed to be a security risk (that was the reason of the removal). In this perspective showing the version number to logged in users should be considered as a security risk as well. > Show version information inside CMS > ----------------------------------- > > Key: HREPTWO-3880 > URL: http://issues.onehippo.com/browse/HREPTWO-3880 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Bart van der Schans > Assignee: Rolf van der Steen > Fix For: r2.13.00 > > > This is the follow up on: HREPTWO-3691 > A location, design, style and html is needed. > From Stephan: "show versio nr inside the CMS (not too deep please - e.g. not system/admin page)" > Please note that showing the version number on the login page (ie also for not authorized users) is assumed to be a security risk (that was the reason of the removal). In this perspective showing the version number to logged in users should be considered as a security risk as well. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 14:11:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 14:16:09 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3880) Show version information inside CMS In-Reply-To: <16844480.1317.1267018850472.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21295299.528.1268053908526.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3880?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3880: ------------------------------------ Fix Version/s: Backlog (was: r2.13.00) Consider: do this as part of the header/banner redesign > Show version information inside CMS > ----------------------------------- > > Key: HREPTWO-3880 > URL: http://issues.onehippo.com/browse/HREPTWO-3880 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Bart van der Schans > Assignee: Rolf van der Steen > Fix For: Backlog > > > This is the follow up on: HREPTWO-3691 > A location, design, style and html is needed. > From Stephan: "show versio nr inside the CMS (not too deep please - e.g. not system/admin page)" > Please note that showing the version number on the login page (ie also for not authorized users) is assumed to be a security risk (that was the reason of the removal). In this perspective showing the version number to logged in users should be considered as a security risk as well. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 14:44:48 2010 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Mar 8 14:49:09 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3955) add content-disposition header to downloads Message-ID: <13747557.570.1268055888611.JavaMail.jira@jira.vm.castaserver.com> add content-disposition header to downloads ------------------------------------------- Key: HREPTWO-3955 URL: http://issues.onehippo.com/browse/HREPTWO-3955 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Arje Cahn Assignee: Berry van Halderen -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 14:46:48 2010 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Mar 8 14:51:08 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3955) add content-disposition header to downloads In-Reply-To: <13747557.570.1268055888611.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <14323509.579.1268056008662.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3955?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-3955: ------------------------------- Description: Whenever a download link is shown in the CMS, add a content-disposition header to the response of the file to download. This will enforce the browser to show a "do you want to open or save" dialog. > add content-disposition header to downloads > ------------------------------------------- > > Key: HREPTWO-3955 > URL: http://issues.onehippo.com/browse/HREPTWO-3955 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Arje Cahn > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > > Whenever a download link is shown in the CMS, add a content-disposition header to the response of the file to download. This will enforce the browser to show a "do you want to open or save" dialog. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 14:48:48 2010 From: helpdesk at onehippo.com (JIRA (Arje Cahn)) Date: Mon Mar 8 14:53:09 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3955) add content-disposition header to downloads In-Reply-To: <13747557.570.1268055888611.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <14292935.590.1268056128695.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3955?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arje Cahn updated HREPTWO-3955: ------------------------------- Attachment: Screen shot 2010-03-08 at 2.50.46 PM.png > add content-disposition header to downloads > ------------------------------------------- > > Key: HREPTWO-3955 > URL: http://issues.onehippo.com/browse/HREPTWO-3955 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Arje Cahn > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > Attachments: Screen shot 2010-03-08 at 2.50.46 PM.png > > > Whenever a download link is shown in the CMS, add a content-disposition header to the response of the file to download. This will enforce the browser to show a "do you want to open or save" dialog. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 8 15:27:08 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 8 15:31:32 2010 Subject: [HippoRepos-dev] [22041] hippo-ecm/trunk: HREPTWO-3953: remove head shortcuts, move perspective layouts to their plugins Message-ID: <20100308142708.DC2CE1C020@svn.vm.castaserver.com> Revision: 22041 Author: fvlankvelt Date: 2010-03-08 15:27:08 +0100 (Mon, 08 Mar 2010) Log Message: ----------- HREPTWO-3953: remove head shortcuts, move perspective layouts to their plugins Modified Paths: -------------- hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml hippo-ecm/trunk/package/config/src/main/resources/cms-preview.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/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutLink.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.properties hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin_nl.properties Removed Paths: ------------- hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.properties hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin_nl.properties hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.properties hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin_nl.properties hippo-ecm/trunk/package/config/src/main/resources/cms-headshortcuts.xml hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/cms/browse/ hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/cms/edit/ hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/logout/ Deleted: hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,19 +0,0 @@ - - - - - Copied: hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html (from rev 22013, hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html) =================================================================== --- hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html (rev 0) +++ hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.html 2010-03-08 14:27:08 UTC (rev 22041) @@ -0,0 +1,31 @@ + + + +
    +
    +
    +
    navigator here
    +
    +
    +
    +
    [ Editor ]
    +
    +
    +
    +
    +     + Modified: hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java =================================================================== --- hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/browse/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java 2010-03-08 14:27:08 UTC (rev 22041) @@ -18,15 +18,13 @@ import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.standards.perspective.Perspective; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; +import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; public class BrowserPerspective extends Perspective { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; - private static final Logger log = LoggerFactory.getLogger(BrowserPerspective.class); - private static final long serialVersionUID = 1L; public BrowserPerspective(IPluginContext context, final IPluginConfig config) { @@ -35,6 +33,8 @@ // register as the IRenderService for the browser service String browserId = config.getString("browser.id"); context.registerService(this, browserId); + + add(new WireframeBehavior(new WireframeSettings(config.getPluginConfig("layout.wireframe")))); } } Deleted: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,19 +0,0 @@ - - - - - Copied: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html (from rev 22013, hippo-ecm/trunk/package/layout/src/main/webapp/WEB-INF/default/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html) =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html (rev 0) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-08 14:27:08 UTC (rev 22041) @@ -0,0 +1,30 @@ + + + +
    +
    +
    workflow here
    +
    feedback here
    +
    +
    +
    +
    +
    +
    +
    +     + Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-08 14:27:08 UTC (rev 22041) @@ -36,8 +36,8 @@ import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; import org.hippoecm.frontend.plugins.standards.perspective.Perspective; -import org.hippoecm.frontend.plugins.yui.YuiPluginHelper; import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; @@ -102,7 +102,11 @@ }, config.getString(IValidationService.VALIDATE_ID)); } - wfSettings = new WireframeSettings(YuiPluginHelper.getConfig(config)); + IPluginConfig wfConfig = config.getPluginConfig("layout.wireframe"); + if (wfConfig == null) { + wfConfig = new JavaPluginConfig(); + } + wfSettings = new WireframeSettings(wfConfig); UnitSettings topSettings = wfSettings.getUnitSettingsByPosition("top"); topHeight = topSettings.getHeight(); add(new WireframeBehavior(wfSettings)); Copied: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutLink.java (from rev 22013, hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.java) =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutLink.java (rev 0) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutLink.java 2010-03-08 14:27:08 UTC (rev 22041) @@ -0,0 +1,71 @@ +/* + * 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.root; + +import javax.jcr.RepositoryException; +import javax.jcr.Session; + +import org.apache.wicket.MarkupContainer; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.markup.html.AjaxLink; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.model.PropertyModel; +import org.hippoecm.frontend.session.UserSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LogoutLink extends MarkupContainer { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + static final Logger log = LoggerFactory.getLogger(LogoutLink.class); + + @SuppressWarnings("unused") + private String username; + + public LogoutLink(String id) { + super(id); + + UserSession session = (UserSession) getSession(); + username = session.getJcrSession().getUserID(); + + add(new Label("username", new PropertyModel(this, "username"))); + + add(new AjaxLink("logout-link") { + private static final long serialVersionUID = 1L; + + @Override + public void onClick(AjaxRequestTarget target) { + LogoutLink.this.logout(); + } + }); + } + + protected void logout() { + UserSession userSession = (UserSession)getSession(); + try { + Session session = userSession.getJcrSession(); + if (session != null) { + session.save(); + } + } catch (RepositoryException e) { + log.error(e.getMessage()); + } + userSession.logout(); + } +} Property changes on: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutLink.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.html 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.html 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,25 +0,0 @@ - - - - -
      -
    • - -
      • -
    -     - Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.java 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.java 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,78 +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.cms.root; - -import java.rmi.RemoteException; - -import javax.jcr.RepositoryException; -import javax.jcr.Session; - -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.PropertyModel; -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.service.render.RenderPlugin; -import org.hippoecm.frontend.session.UserSession; -import org.hippoecm.repository.api.HippoWorkspace; -import org.hippoecm.repository.api.Workflow; -import org.hippoecm.repository.standardworkflow.EventLoggerWorkflow; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class LogoutPlugin extends RenderPlugin { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - static final Logger log = LoggerFactory.getLogger(LogoutPlugin.class); - - @SuppressWarnings("unused") - private String username; - - public LogoutPlugin(IPluginContext context, IPluginConfig config) { - super(context, config); - - UserSession session = (UserSession) getSession(); - username = session.getJcrSession().getUserID(); - - add(new Label("username", new PropertyModel(this, "username"))); - - add(new AjaxLink("logout-link") { - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - LogoutPlugin.this.logout(); - } - }); - } - - protected void logout() { - UserSession userSession = (UserSession)getSession(); - try { - Session session = userSession.getJcrSession(); - if (session != null) { - session.save(); - } - } catch (RepositoryException e) { - log.error(e.getMessage()); - } - userSession.logout(); - } -} Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.properties =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.properties 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.properties 2010-03-08 14:27:08 UTC (rev 22041) @@ -1 +0,0 @@ -logout-label: Logout \ No newline at end of file Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin_nl.properties =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin_nl.properties 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin_nl.properties 2010-03-08 14:27:08 UTC (rev 22041) @@ -1 +0,0 @@ -logout-label: Uitloggen \ No newline at end of file Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.html 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.html 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,28 +0,0 @@ - - - - -
      -
    • - -
      • -
    • - -
      • -
    -     - Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.java 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.java 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,54 +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.cms.root; - -import javax.servlet.http.Cookie; - -import org.apache.wicket.RequestCycle; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.protocol.http.WebRequest; -import org.apache.wicket.protocol.http.WebResponse; - -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; - -public class PersistentLogoutPlugin extends LogoutPlugin { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - public PersistentLogoutPlugin(IPluginContext context, IPluginConfig config) { - super(context, config); - - add(new AjaxLink("logout-force-link") { - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - Cookie[] cookies = ((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest().getCookies(); - for (int i = 0; i < cookies.length; i++) { - if ("org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin".equals(cookies[i].getName()) || - getClass().getName().equals(cookies[i].getName())) { - ((WebResponse)RequestCycle.get().getResponse()).clearCookie(cookies[i]); - } - } - PersistentLogoutPlugin.this.logout(); - } - }); - } -} Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.properties =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.properties 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin.properties 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,2 +0,0 @@ -logout-label: Relogin -logout-force-label: Logout Deleted: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin_nl.properties =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin_nl.properties 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/PersistentLogoutPlugin_nl.properties 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,2 +0,0 @@ -logout-label: Herinloggen -logout-force-label: Uitloggen Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-08 14:27:08 UTC (rev 22041) @@ -24,11 +24,15 @@
    Hippo CMS 7 -
    logout
    +
    + [ user ] +
      +
    • + +
      • +
    +
    -
    -
    shortcuts here
    -
    Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-08 14:27:08 UTC (rev 22041) @@ -46,6 +46,7 @@ super(context, config); add(new Pinger("pinger")); + add(new LogoutLink("logout")); PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("layout.page")); add(new PageLayoutBehavior(plSettings)); Copied: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.properties (from rev 22013, hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin.properties) =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.properties (rev 0) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.properties 2010-03-08 14:27:08 UTC (rev 22041) @@ -0,0 +1 @@ +logout-label: Logout \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.properties ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Copied: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin_nl.properties (from rev 22013, hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/LogoutPlugin_nl.properties) =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin_nl.properties (rev 0) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin_nl.properties 2010-03-08 14:27:08 UTC (rev 22041) @@ -0,0 +1 @@ +logout-label: Uitloggen \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin_nl.properties ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-08 14:27:08 UTC (rev 22041) @@ -40,10 +40,6 @@ service.translator.config - - service.behavior.tabs - service.behavior.browser - extension.navigator extension.editor @@ -54,18 +50,7 @@ service.browse - - - - frontend:plugin - - - service.behavior.browser - - - org.hippoecm.frontend.plugins.yui.layout.WireframePlugin - - + frontend:pluginconfig @@ -429,7 +414,8 @@ service.browse.editor - + + frontend:plugin Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-08 14:27:08 UTC (rev 22041) @@ -66,7 +66,7 @@ ${validator.id} - + frontend:pluginconfig @@ -122,9 +122,9 @@ frontend:pluginconfig - - ${cluster.id}.validator - + + ${cluster.id}.validator + Deleted: hippo-ecm/trunk/package/config/src/main/resources/cms-headshortcuts.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-headshortcuts.xml 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-headshortcuts.xml 2010-03-08 14:27:08 UTC (rev 22041) @@ -1,104 +0,0 @@ - - - - - frontend:plugincluster - - - - - - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-08 14:27:08 UTC (rev 22041) @@ -57,7 +57,7 @@ ${wicket.model} - + frontend:pluginconfig Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-08 14:27:08 UTC (rev 22041) @@ -400,19 +400,9 @@ service.center - - service.logout - - - service.browse.shortcuts - org.hippoecm.frontend.plugins.cms.root.RootPlugin - - extension.logout - extension.shortcuts - service.root @@ -494,37 +484,6 @@ - - - frontend:plugin - - - service.browse.shortcuts.shortcut - - - org.hippoecm.frontend.service.render.ListViewPlugin - - - service.browse.shortcuts - - - - - frontend:plugin - - - org.hippoecm.frontend.plugin.workflow.ShortcutsPlugin - - - shortcutstoo.id - - - /jcr:root/hippo:configuration/hippo:frontend/cms/cms-headshortcuts/node() - - - service.browse.shortcuts.shortcut - - @@ -551,18 +510,6 @@ - - - frontend:plugin - - - org.hippoecm.frontend.plugins.cms.root.LogoutPlugin - - - service.logout - - - frontend:plugin @@ -576,9 +523,6 @@ service.translator.config - - service.behavior.tabs - service.tab Modified: hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml 2010-03-08 14:04:21 UTC (rev 22040) +++ hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml 2010-03-08 14:27:08 UTC (rev 22041) @@ -93,21 +93,6 @@ - - - hippo:initializeitem - - - cms-headshortcuts.xml - - - /hippo:configuration/hippo:frontend/cms - - - 901.0 - - - hippo:initializeitem From helpdesk at onehippo.com Mon Mar 8 15:27:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 15:32:08 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3932) Calendar separates from the Date field after a scroll In-Reply-To: <27313642.6928.1267716290672.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <4720575.710.1268058468816.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3932?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3932: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: (was: r2.12.07) Priority: Low (was: Normal) > Calendar separates from the Date field after a scroll > ----------------------------------------------------- > > Key: HREPTWO-3932 > URL: http://issues.onehippo.com/browse/HREPTWO-3932 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.onehippo.org/repos/hippo/hippo-ecm/trunk > Repository Root: http://svn.onehippo.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22029 > Node Kind: directory > Schedule: normal > Last Changed Author: fvlankvelt > Last Changed Rev: 22028 > Last Changed Date: 2010-03-03 17:55:19 +0100 (Wed, 03 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Priority: Low > Fix For: r2.13.00 > > > While validating https://issues.onehippo.com/browse/HREPTWO-3845, I discovered this little issue. It affects both IE and FFx. > STEPS: > ------ > - edit a document of type News > - redimension the browser's window so that a vertical scrollbar becomes visible > - click on the Calendar icon in the Date field > - scroll down > - notice the Calendar stays in the position on the screen where it was first displayed instead of staying near the Date field > - maximize the browser's window, note that the calendar is not more displayed in its context. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 8 16:27:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 8 16:32:08 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3714) Consolidate: Do not index hippo:resource binary property but text property instead In-Reply-To: <30747818.239121265028660359.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21512710.803.1268062068592.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=85949#action_85949 ] Stephan Westen commented on HREPTWO-3714: ----------------------------------------- Impact on upgrade!! > Consolidate: Do not index hippo:resource binary property but text property instead > ---------------------------------------------------------------------------------- > > Key: HREPTWO-3714 > URL: http://issues.onehippo.com/browse/HREPTWO-3714 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Stephan Westen > Assignee: Stephan Westen > Priority: Top > Fix For: r2.13.00 > > > There are some shortcuts in repository to support this, we need to consolidate. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 9 10:05:48 2010 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Tue Mar 9 10:10:11 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3955) add content-disposition header to downloads In-Reply-To: <13747557.570.1268055888611.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30660535.1033.1268125548543.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3955?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86003#action_86003 ] Ard Schrijvers commented on HREPTWO-3955: ----------------------------------------- Possibly see HST2 svn BinariesServlet as this one already sets content disposition /hst-client/src/main/java/org/hippoecm/hst/servlet/BinariesServlet.java > add content-disposition header to downloads > ------------------------------------------- > > Key: HREPTWO-3955 > URL: http://issues.onehippo.com/browse/HREPTWO-3955 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Arje Cahn > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > Attachments: Screen shot 2010-03-08 at 2.50.46 PM.png > > > Whenever a download link is shown in the CMS, add a content-disposition header to the response of the file to download. This will enforce the browser to show a "do you want to open or save" dialog. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 9 15:23:56 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 9 15:28:20 2010 Subject: [HippoRepos-dev] [22050] hippo-ecm: HREPTWO-16: fix NPE on empty string Message-ID: <20100309142356.CA5B11C021@svn.vm.castaserver.com> Revision: 22050 Author: fvlankvelt Date: 2010-03-09 15:23:56 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-16: fix NPE on empty string Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java 2010-03-09 14:15:29 UTC (rev 22049) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java 2010-03-09 14:23:56 UTC (rev 22050) @@ -32,7 +32,12 @@ } public void setObject(String object) { - decorated.setObject(Strings.escapeMarkup(object).toString()); + CharSequence escaped = Strings.escapeMarkup(object); + if (escaped != null) { + decorated.setObject(escaped.toString()); + } else { + decorated.setObject(null); + } } public void detach() { From svn-logs at hippocms.org Tue Mar 9 15:28:01 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 9 15:32:29 2010 Subject: [HippoRepos-dev] [22051] hippo-ecm: HREPTWO-16: test for null before toString call Message-ID: <20100309142802.14D641C020@svn.vm.castaserver.com> Revision: 22051 Author: fvlankvelt Date: 2010-03-09 15:28:01 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-16: test for null before toString call Empty string is translated to null by wicket. Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java 2010-03-09 14:23:56 UTC (rev 22050) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/EncodedStringModel.java 2010-03-09 14:28:01 UTC (rev 22051) @@ -32,7 +32,12 @@ } public void setObject(String object) { - decorated.setObject(Strings.escapeMarkup(object).toString()); + CharSequence escaped = Strings.escapeMarkup(object); + if (escaped != null) { + decorated.setObject(escaped.toString()); + } else { + decorated.setObject(null); + } } public void detach() { Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22035 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 From svn-logs at hippocms.org Tue Mar 9 16:31:33 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 9 16:35:58 2010 Subject: [HippoRepos-dev] [22052] hippo-ecm/trunk: HREPTWO-3953: reduce complexity in the wireframe configuration Message-ID: <20100309153133.2964A1C020@svn.vm.castaserver.com> Revision: 22052 Author: fvlankvelt Date: 2010-03-09 16:31:32 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3953: reduce complexity in the wireframe configuration The distinction between wrappers and units has been eliminated. Each unit should have a body or a component with a unitbehavior. Modified Paths: -------------- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml Added Paths: ----------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java Removed Paths: ------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java Modified: hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html 2010-03-09 15:31:32 UTC (rev 22052) @@ -19,9 +19,9 @@
    bar -
    +
    -
    +
    Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-09 15:31:32 UTC (rev 22052) @@ -17,8 +17,10 @@
    -
    workflow here
    -
    feedback here
    +
    +
    workflow here
    +
    feedback here
    +
    Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -107,7 +107,7 @@ wfConfig = new JavaPluginConfig(); } wfSettings = new WireframeSettings(wfConfig); - UnitSettings topSettings = wfSettings.getUnitSettingsByPosition("top"); + UnitSettings topSettings = wfSettings.getUnit("top"); topHeight = topSettings.getHeight(); add(new WireframeBehavior(wfSettings)); } @@ -116,7 +116,7 @@ public void render(PluginRequestTarget target) { super.render(target); boolean hasMessage = feedback.anyMessage(); - UnitSettings topSettings = wfSettings.getUnitSettingsByPosition("top"); + UnitSettings topSettings = wfSettings.getUnit("top"); boolean updateTop = false; if (hasMessage && !feedbackShown) { topSettings.setHeight(Integer.valueOf( @@ -129,7 +129,7 @@ updateTop = true; } if (updateTop && isVisibleInHierarchy()) { - String topId = topSettings.getElementId(); + String topId = topSettings.getId().getElementId(); target.appendJavascript("YAHOO.hippo.LayoutManager.findLayoutUnit(YAHOO.util.Dom.get('" + topId + "')).set('height', " + topSettings.getHeight() + ");"); target.addComponent(feedback); Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-09 15:31:32 UTC (rev 22052) @@ -33,7 +33,7 @@
    -
    +
    Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -15,7 +15,6 @@ */ package org.hippoecm.frontend.plugins.cms.root; -import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.PluginRequestTarget; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; @@ -27,7 +26,6 @@ import org.hippoecm.frontend.plugins.yui.layout.PageLayoutBehavior; import org.hippoecm.frontend.plugins.yui.layout.PageLayoutSettings; import org.hippoecm.frontend.plugins.yui.layout.UnitBehavior; -import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; @@ -48,7 +46,9 @@ add(new Pinger("pinger")); add(new LogoutLink("logout")); - PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("layout.page")); + PageLayoutSettings plSettings = new PageLayoutSettings(); + plSettings.setHeaderHeight(50); + // TODO: update settings from config add(new PageLayoutBehavior(plSettings)); add(new AjaxIndicatorBehavior()); @@ -68,18 +68,10 @@ add(new BrowserSpecificStylesheetsBehavior(configurations)); get("tabs").add(new WireframeBehavior(new WireframeSettings(config.getPluginConfig("layout.wireframe")))); - get("tabs:panel-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.panel")))); - get("tabs:tabs-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.tabs")))); + get("tabs:panel-container").add(new UnitBehavior("center")); + get("tabs:tabs-container").add(new UnitBehavior("left")); } - static UnitSettings createSettings(IPluginConfig config) { - if (config.containsKey("options")) { - return new UnitSettings(config.getString("position"), new ValueMap(config.getString("options"))); - } else { - return new UnitSettings(config); - } - } - @Override public void render(PluginRequestTarget target) { if (!rendered) { Modified: hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml =================================================================== --- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-09 15:31:32 UTC (rev 22052) @@ -168,10 +168,6 @@ template-type-wrapper - - center - right - Modified: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -320,8 +320,7 @@ // YUCK! WebAppBehavior yuiWebApp = new WebAppBehavior(new WebAppSettings()); home.add(yuiWebApp); - context.registerService(yuiWebApp, "service.behavior.yui"); - home.add(new PageLayoutBehavior(new PageLayoutSettings(new JavaPluginConfig()))); + home.add(new PageLayoutBehavior(new PageLayoutSettings())); Node templateTypeNode = session.getRootNode().getNode("hippo:namespaces/test/edited"); JcrNodeModel nodeModel = new JcrNodeModel(templateTypeNode); @@ -357,8 +356,7 @@ // YUCK! WebAppBehavior yuiWebApp = new WebAppBehavior(new WebAppSettings()); home.add(yuiWebApp); - context.registerService(yuiWebApp, "service.behavior.yui"); - home.add(new PageLayoutBehavior(new PageLayoutSettings(new JavaPluginConfig()))); + home.add(new PageLayoutBehavior(new PageLayoutSettings())); Node templateTypeNode = session.getRootNode().getNode("hippo:namespaces/test/edited"); JcrNodeModel nodeModel = new JcrNodeModel(templateTypeNode); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -20,6 +20,7 @@ import java.util.Map; import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.IHeaderResponse; @@ -91,7 +92,7 @@ if (getSettings() instanceof YuiObject) { return ((YuiObject) getSettings()).toScript(); } else if (getSettings() != null) { - return JSONObject.fromObject(getSettings()).toString(); + return JSONObject.fromObject(getSettings(), getJsonConfig()).toString(); } else { return "null"; } @@ -121,4 +122,8 @@ return configuration; } + public JsonConfig getJsonConfig() { + return new JsonConfig(); + } + } Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -1,80 +0,0 @@ -/* - * Copyright 2009 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.yui.javascript; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.wicket.IClusterable; - -/** - * The YuiId allows for transparent element id resolution, without having to worry about id clashes on the client. - * - * The idea is really simple. A YuiId consists of an id value, and an optional parentId value. If the parentId is set, - * the YuiId will return an elementId like 'parentId:id', else it will only return the local id. - * - * The id value corresponds to an element in a {@link org.apache.wicket.Component}'s html file through the attribute - * yui:id, the parent id is a normal id-attribute, normally generated by Wicket and added to the YuiId once it's known. - * - * The YAHOO.hippo.LayoutManager module uses YAHOO.hippo.Dom.resolveElement(id) to resolve elements by their YuiId. - * For more info see: - * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/hippodom/hippodom.js - */ -public class YuiId implements IClusterable { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - String id; - String parentId; - - public YuiId(String id) { - this.id = id; - } - - public String getElementId() { - if (parentId != null && !"".equals(parentId)) { - if (id != null && !"".equals(id)) { - return parentId + ":" + id; - } - } else { - return id; - } - return ""; - } - - public void setId(String id) { - this.id = id; - } - - public String getId() { - return id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", id) - .append("parentId", parentId).toString(); - } -} Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -1,59 +0,0 @@ -/* - * Copyright 2009 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.yui.javascript; - -import org.hippoecm.frontend.plugin.config.IPluginConfig; - -public class YuiIdSetting extends Setting { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - public YuiIdSetting(String javascriptKey) { - super(javascriptKey, null); - } - - public YuiIdSetting(String javascriptKey, YuiId defaultValue) { - super(javascriptKey, defaultValue); - } - - public YuiId newValue() { - if (defaultValue != null) { - YuiId id = new YuiId(defaultValue.id); - if (defaultValue.parentId != null) { - id.setParentId(defaultValue.parentId); - } - return id; - } else { - return null; - } - } - - @Override - protected YuiId getValueFromConfig(IPluginConfig config, YuiObject settings) { - return new YuiId(config.getString(configKey)); - } - - public void setFromString(String value, YuiObject settings) { - set(new YuiId(value), settings); - } - - public String getScriptValue(YuiId value) { - return StringSetting.escapeString(value.getElementId()); - } - -} Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -16,7 +16,6 @@ package org.hippoecm.frontend.plugins.yui.layout; import org.apache.wicket.behavior.IBehavior; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; /** * Base wireframe interface, allows wireframes that are linked to their parent to register Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -15,15 +15,14 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import net.sf.json.JsonConfig; + import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.util.template.PackagedTextTemplate; -import org.hippoecm.frontend.plugins.yui.AbstractYuiAjaxBehavior; +import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; import org.hippoecm.frontend.plugins.yui.HippoNamespace; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.HippoTextTemplate; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; /** * Special purpose {@link WireframeBehavior} that automatically binds itself to the document body and creates a @@ -38,7 +37,7 @@ * * @see WireframeBehavior */ -public class PageLayoutBehavior extends AbstractYuiAjaxBehavior implements IWireframeService { +public class PageLayoutBehavior extends AbstractYuiBehavior implements IWireframeService { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -50,7 +49,6 @@ private HippoTextTemplate template; public PageLayoutBehavior(final PageLayoutSettings settings) { - super(settings); this.settings = settings; template = new HippoTextTemplate(INIT_PAGE, "YAHOO.hippo.GridsRootWireframe") { private static final long serialVersionUID = 1L; @@ -61,9 +59,16 @@ } @Override - public YuiObject getSettings() { + public PageLayoutSettings getSettings() { return settings; } + + @Override + public JsonConfig getJsonConfig() { + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + return jsonConfig; + } }; } @@ -75,10 +80,6 @@ } @Override - protected void respond(AjaxRequestTarget target) { - } - - @Override public void detach(Component component) { template.detach(); } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -15,58 +15,145 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.AjaxSettings; -import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; -import org.hippoecm.frontend.plugins.yui.javascript.IntSetting; -import org.hippoecm.frontend.plugins.yui.javascript.StringSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +import java.io.Serializable; -public class PageLayoutSettings extends AjaxSettings { + +public class PageLayoutSettings implements Serializable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private static final YuiIdSetting ROOT_ID = new YuiIdSetting("rootId", new YuiId("doc3")); + private YuiId rootId = new YuiId("doc3"); - private static final IntSetting HEADER_HEIGHT = new IntSetting("headerHeight"); - private static final IntSetting FOOTER_HEIGHT = new IntSetting("footerHeight"); - private static final IntSetting LEFT_WIDTH = new IntSetting("leftWidth"); - private static final IntSetting RIGHT_WIDTH = new IntSetting("rightWidth"); + private int headerHeight; + private int footerHeight; + private int leftWidth; + private int rightWidth; - private static final StringSetting HEADER_GUTTER = new StringSetting("headerGutter"); - private static final StringSetting BODY_GUTTER = new StringSetting("bodyGutter"); - private static final StringSetting FOOTER_GUTTER = new StringSetting("footerGutter"); - private static final StringSetting LEFT_GUTTER = new StringSetting("leftGutter"); - private static final StringSetting RIGHT_GUTTER = new StringSetting("rightGutter"); + private String headerGutter = "0px 0px 0px 0px"; + private String bodyGutter = "0px 0px 0px 0px"; + private String leftGutter = "0px 0px 0px 0px"; + private String rightGutter = "0px 0px 0px 0px"; - private static final BooleanSetting BODY_SCROLL = new BooleanSetting("bodyScroll"); - private static final BooleanSetting HEADER_SCROLL = new BooleanSetting("headerScroll"); - private static final BooleanSetting FOOTER_SCROLL = new BooleanSetting("footerScroll"); - private static final BooleanSetting LEFT_SCROLL = new BooleanSetting("leftScroll"); - private static final BooleanSetting RIGHT_SCROLL = new BooleanSetting("rightScroll"); - - private static final BooleanSetting HEADER_RESIZE = new BooleanSetting("headerResize"); - private static final BooleanSetting FOOTER_RESIZE = new BooleanSetting("footerResize"); - private static final BooleanSetting LEFT_RESIZE = new BooleanSetting("leftResize"); - private static final BooleanSetting RIGHT_RESIZE = new BooleanSetting("rightResize"); - + private boolean bodyScroll; + private boolean headerScroll; + private boolean footerScroll; + private boolean leftScroll; + private boolean rightScroll; - protected static final YuiType TYPE = new YuiType(AjaxSettings.TYPE, ROOT_ID, - HEADER_HEIGHT, FOOTER_HEIGHT, LEFT_WIDTH, RIGHT_WIDTH, - HEADER_GUTTER, BODY_GUTTER, FOOTER_GUTTER, LEFT_GUTTER, RIGHT_GUTTER, - HEADER_SCROLL, FOOTER_SCROLL, LEFT_SCROLL, RIGHT_SCROLL, BODY_SCROLL, - HEADER_RESIZE, FOOTER_RESIZE, LEFT_RESIZE, RIGHT_RESIZE); + private boolean headerResize; + private boolean footerResize; + private boolean leftResize; + private boolean rightResize; - public PageLayoutSettings(IPluginConfig config) { - super(TYPE, config); + public void setRootId(YuiId rootId) { + this.rootId = rootId; } - public YuiId getRootId() { - return ROOT_ID.get(this); + return rootId; } + public void setHeaderHeight(int headerHeight) { + this.headerHeight = headerHeight; + } + public int getHeaderHeight() { + return headerHeight; + } + public void setFooterHeight(int footerHeight) { + this.footerHeight = footerHeight; + } + public int getFooterHeight() { + return footerHeight; + } + public void setLeftWidth(int leftWidth) { + this.leftWidth = leftWidth; + } + public int getLeftWidth() { + return leftWidth; + } + public void setRightWidth(int rightWidth) { + this.rightWidth = rightWidth; + } + public int getRightWidth() { + return rightWidth; + } + public void setHeaderGutter(String headerGutter) { + this.headerGutter = headerGutter; + } + public String getHeaderGutter() { + return headerGutter; + } + public void setBodyGutter(String bodyGutter) { + this.bodyGutter = bodyGutter; + } + public String getBodyGutter() { + return bodyGutter; + } + public void setLeftGutter(String leftGutter) { + this.leftGutter = leftGutter; + } + public String getLeftGutter() { + return leftGutter; + } + public void setRightGutter(String rightGutter) { + this.rightGutter = rightGutter; + } + public String getRightGutter() { + return rightGutter; + } + public void setBodyScroll(boolean bodyScroll) { + this.bodyScroll = bodyScroll; + } + public boolean isBodyScroll() { + return bodyScroll; + } + public void setHeaderScroll(boolean headerScroll) { + this.headerScroll = headerScroll; + } + public boolean isHeaderScroll() { + return headerScroll; + } + public void setFooterScroll(boolean footerScroll) { + this.footerScroll = footerScroll; + } + public boolean isFooterScroll() { + return footerScroll; + } + public void setLeftScroll(boolean leftScroll) { + this.leftScroll = leftScroll; + } + public boolean isLeftScroll() { + return leftScroll; + } + public void setRightScroll(boolean rightScroll) { + this.rightScroll = rightScroll; + } + public boolean isRightScroll() { + return rightScroll; + } + public void setHeaderResize(boolean headerResize) { + this.headerResize = headerResize; + } + public boolean isHeaderResize() { + return headerResize; + } + public void setFooterResize(boolean footerResize) { + this.footerResize = footerResize; + } + public boolean isFooterResize() { + return footerResize; + } + public void setLeftResize(boolean leftResize) { + this.leftResize = leftResize; + } + public boolean isLeftResize() { + return leftResize; + } + public void setRightResize(boolean rightResize) { + this.rightResize = rightResize; + } + public boolean isRightResize() { + return rightResize; + } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -16,7 +16,6 @@ package org.hippoecm.frontend.plugins.yui.layout; -import java.util.List; import java.util.Map; import org.apache.commons.lang.builder.HashCodeBuilder; @@ -44,16 +43,15 @@ static final Logger log = LoggerFactory.getLogger(UnitBehavior.class); - private UnitSettings settings; + private String position; - public UnitBehavior(UnitSettings settings) { - this.settings = settings; + public UnitBehavior(String position) { + this.position = position; } @Override public void bind(final Component component) { super.bind(component); - settings.setMarkupId(component.getMarkupId(true)); // re-render complete wireframe during the render phase AjaxRequestTarget target = AjaxRequestTarget.get(); @@ -66,7 +64,7 @@ MarkupContainer parent = component.getParent(); boolean found = false; while (parent != null) { - for (IBehavior behavior : (List) parent.getBehaviors()) { + for (IBehavior behavior : parent.getBehaviors()) { if (behavior instanceof IWireframeService) { target.addComponent(parent); found = true; @@ -89,8 +87,8 @@ } } - public UnitSettings getSettings() { - return settings; + public String getPosition() { + return position; } @Override Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -16,17 +16,14 @@ package org.hippoecm.frontend.plugins.yui.layout; import org.apache.wicket.behavior.IBehavior; -import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.plugin.IPlugin; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.Plugin; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.YuiPluginHelper; import org.hippoecm.frontend.service.IBehaviorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Special purpose {@link Plugin} that allows us to add the behavior through configuration instead of adding it * in code to our component. @@ -51,14 +48,6 @@ } public IBehavior getBehavior() { - return new UnitBehavior(createSettings(YuiPluginHelper.getConfig(getPluginConfig()))); + return new UnitBehavior(getPluginConfig().getString("position")); } - - static UnitSettings createSettings(IPluginConfig config) { - if (config.containsKey("options")) { - return new UnitSettings(config.getString("position"), new ValueMap(config.getString("options"))); - } else { - return new UnitSettings(config); - } - } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -15,15 +15,11 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import java.io.Serializable; + import org.apache.wicket.util.value.IValueMap; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; -import org.hippoecm.frontend.plugins.yui.javascript.IntSetting; -import org.hippoecm.frontend.plugins.yui.javascript.StringSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; -import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +34,9 @@ * ID: a {@link YuiId} value representing the unit's root element. * *
  • - * BODY: a {@link YuiId} value representing the unit's body element. + * BODY: a {@link YuiId} value representing the unit's body element. The body should not be configured when the unit + * wraps a {@link Component} with a {@link UnitBehavior}. When neither body nor UnitBehavior is present, a body + * element will be generated. *
    • *
  • * WIDTH: width (in pixels) that the unit will take up in the wireframe (only applies to left and right units and @@ -75,7 +73,7 @@ *
    • * */ -public class UnitSettings extends YuiObject { +public class UnitSettings implements Serializable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -83,155 +81,119 @@ static final Logger log = LoggerFactory.getLogger(UnitSettings.class); - private static final StringSetting POSITION = new StringSetting("position"); - private static final YuiIdSetting ID = new YuiIdSetting("id"); - private static final YuiIdSetting BODY = new YuiIdSetting("body"); + private String position = "center"; + private YuiId id = new YuiId(""); + private YuiId body = new YuiId(""); - private static final StringSetting WIDTH = new StringSetting("width"); - private static final StringSetting HEIGHT = new StringSetting("height"); + private String width; + private String height; - private static final StringSetting MIN_WIDTH = new StringSetting("minWidth"); - private static final StringSetting MIN_HEIGHT = new StringSetting("minHeight"); + private String minWidth; + private String minHeight; - private static final StringSetting GUTTER = new StringSetting("gutter"); - private static final BooleanSetting SCROLL = new BooleanSetting("scroll"); - private static final BooleanSetting RESIZE = new BooleanSetting("resize"); - private static final BooleanSetting USE_SHIM = new BooleanSetting("useShim"); - + private String gutter = "0px 0px 0px 0px"; + private boolean scroll; + private boolean resize; + private boolean useShim; + //TODO: does this still work? - private static final IntSetting Z_INDEX = new IntSetting("zindex"); + //private static final IntSetting Z_INDEX = new IntSetting("zindex"); - protected final static YuiType TYPE = new YuiType(POSITION, ID, BODY, WIDTH, HEIGHT, MIN_WIDTH, MIN_HEIGHT, GUTTER, - SCROLL, RESIZE, Z_INDEX, USE_SHIM); - public static final String TOP = "top"; public static final String RIGHT = "right"; public static final String BOTTOM = "bottom"; public static final String LEFT = "left"; public static final String CENTER = "center"; - private String wrapperId; - private String markupId; - - public UnitSettings(String position) { - super(TYPE); - POSITION.set(position, this); + public UnitSettings(String position, IValueMap config) { + this.position = position; + if (config != null) { + try { + PluginConfigMapper.populate(this, config); + } catch (MappingException e) { + throw new RuntimeException("invalid configuration"); + } + id.setId(config.getString("id")); + if (config.containsKey("body")) { + body.setId(config.getString("body")); + } + } } - public UnitSettings(String position, IValueMap options) { - super(TYPE); - POSITION.set(position, this); - updateValues(options); + public String getPosition() { + return position; } - public UnitSettings(IPluginConfig config) { - super(TYPE, config); + public void setWidth(String width) { + this.width = width; } - public void setPosition(String position, YuiObject settings) { - POSITION.set(position, settings); - } - - public String getPosition() { - return POSITION.get(this); - } - public String getWidth() { - return WIDTH.get(this); + return width; } - public void setWidth(String width) { - WIDTH.set(width, this); + public void setHeight(String height) { + this.height = height; } public String getHeight() { - return HEIGHT.get(this); + return height; } - public void setHeight(String height) { - HEIGHT.set(height, this); + public void setMinWidth(String minWidth) { + this.minWidth = minWidth; } public String getMinWidth() { - return MIN_WIDTH.get(this); + return minWidth; } - public void setMinWidth(String minWidth) { - MIN_WIDTH.set(minWidth, this); + public void setMinHeight(String minHeight) { + this.minHeight = minHeight; } public String getMinHeight() { - return MIN_HEIGHT.get(this); + return minHeight; } - public void setMinHeight(String minHeight) { - MIN_HEIGHT.set(minHeight, this); + public void setGutter(String gutter) { + this.gutter = gutter; } - public String getElementId() { - return ID.get(this).getElementId(); + public String getGutter() { + return gutter; } - public String getWrapperId() { - return wrapperId; + public void setScroll(boolean scroll) { + this.scroll = scroll; } - public void setWrapperId(String id) { - wrapperId = id; - notifyListeners(); + public boolean isScroll() { + return scroll; } - public String getMarkupId() { - return markupId; + public void setResize(boolean resize) { + this.resize = resize; } - public String getBody() { - return BODY.getScriptValue(BODY.get(this)); + public boolean isResize() { + return resize; } - public void setMarkupId(String markupId) { - this.markupId = markupId; - if (wrapperId != null) { - if (BODY.get(this) != null) { - BODY.get(this).setId(markupId); - } - } - notifyListeners(); + public void setUseShim(boolean useShim) { + this.useShim = useShim; } - @Override - public boolean isValid() { - return ID.get(this) != null; + public boolean isUseShim() { + return useShim; } - public void setParentMarkupId(String parentMarkupId) { - if (wrapperId != null) { - YuiId id = ID.get(this); - if (id == null) { - ID.set(new YuiId(wrapperId), this); - id = ID.get(this); - } else { - id.setId(wrapperId); - } - id.setParentId(parentMarkupId); + public YuiId getBody() { + return body; + } - YuiId body = BODY.get(this); - if (body == null) { - BODY.set(new YuiId(markupId), this); - } else { - body.setId(markupId); - body.setParentId(null); - } - } else if (ID.get(this) != null) { - YuiId id = ID.get(this); - id.setParentId(parentMarkupId); - - YuiId body = BODY.get(this); - if (body != null) { - body.setParentId(parentMarkupId); - } - } - notifyListeners(); + public YuiId getId() { + return id; } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -15,19 +15,19 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import java.io.Serializable; + +import net.sf.json.JsonConfig; + import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Component.IVisitor; -import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.util.template.PackagedTextTemplate; import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; import org.hippoecm.frontend.plugins.yui.HippoNamespace; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.HippoTextTemplate; -import org.hippoecm.frontend.plugins.yui.javascript.IYuiListener; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; import org.hippoecm.frontend.service.render.RenderService; /** @@ -128,7 +128,7 @@ *

    * * @see org.hippoecm.frontend.plugins.yui.layout.WireframeSettings - * @see org.hippoecm.frontend.plugins.yui.javascript.YuiId + * @see org.hippoecm.frontend.plugins.yui.layout.YuiId */ public class WireframeBehavior extends AbstractYuiBehavior implements IWireframeService { @@ -146,32 +146,26 @@ public WireframeBehavior(final WireframeSettings settings) { this.settings = settings; - this.settings.addListener(new IYuiListener() { - private static final long serialVersionUID = 1L; - public void onEvent(Event event) { - if (component != null) { - AjaxRequestTarget target = AjaxRequestTarget.get(); - if (target != null) { - target.addComponent(component); - } - } - } - - }); - template = new HippoTextTemplate(behaviorJs, settings.getClientClassName()) { private static final long serialVersionUID = 1L; @Override public String getId() { - return settings.getRootElementId().getElementId(); + return settings.getRootId().getElementId(); } @Override - public YuiObject getSettings() { + public Serializable getSettings() { return settings; } + + @Override + public JsonConfig getJsonConfig() { + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + return jsonConfig; + } }; } @@ -179,7 +173,7 @@ * Implements IWireframeService */ public YuiId getParentId() { - return settings.getRootElementId(); + return settings.getRootId(); } @Override @@ -229,13 +223,23 @@ //Visit child components in order to find components that contain a {@link UnitBehavior}. If another wireframe //or unit is encountered, stop going deeper. MarkupContainer cont = (MarkupContainer) component; - cont.visitChildren(new IVisitor() { + cont.visitChildren(new IVisitor() { public Object component(Component component) { for (Object behavior : component.getBehaviors()) { if (behavior instanceof IWireframeService) { return CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; } else if (behavior instanceof UnitBehavior) { - settings.register(((UnitBehavior) behavior).getSettings()); + String position = ((UnitBehavior) behavior).getPosition(); + UnitSettings unit = settings.getUnit(position); + if (unit != null) { + YuiId body = unit.getBody(); + if (body != null) { + body.setParentId(null); + body.setId(component.getMarkupId()); + } + } else { + throw new RuntimeException("Invalid UnitBehavior position " + position); + } return IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -15,16 +15,16 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.wicket.util.value.IValueMap; import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; -import org.hippoecm.frontend.plugins.yui.javascript.IYuiListener; -import org.hippoecm.frontend.plugins.yui.javascript.SettingsArraySetting; -import org.hippoecm.frontend.plugins.yui.javascript.StringArraySetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; -import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; /** * Contains all settings of a wireframe and it's units. @@ -42,183 +42,97 @@ * and resize events. * *
  • - * UNITS: Array of {@UnitSettings} representing the units for this wireframe. These can either be set by the same - * IPluginConfig object as the {@link WireframeSettings} or by merging the {@UnitSettings} of dynamically found - * {@link UnitBehavior}s.
    + * UNITS: Array of {@UnitSettings} representing the units for this wireframe. These should be set by the same + * IPluginConfig object as the {@link WireframeSettings}.
    * The easiest way to configure units is storing the html and configuration all in the same place as the wireframe's * html and configuration. If we use an {@link IPluginConfig} for configuration, we can add a StringArray property * and add the positional name of the units we'd like to add: for example "top" and "center". This will cause the * {@link WireframeSettings} to lookup two String properties on the IPluginConfig named "top" and "center" which * should contain a comma-separated string of UnitSettings, like "id=center,scroll=true,width=120". *
    • - *
  • - * WRAPPERS: TODO - *
    • * * * Warning: this class currently extends the YuiObject which is deprecated and will soon be replaced by a POJO settings * file. Not sure how to handle default values and things like dont-escape-string yet. */ -public class WireframeSettings extends YuiObject { +public class WireframeSettings implements Serializable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private static final YuiIdSetting ROOT_ID = new YuiIdSetting("rootId", new YuiId("")); - private static final YuiIdSetting PARENT_ID = new YuiIdSetting("parentId", new YuiId("")); - private static final BooleanSetting LINKED_WITH_PARENT = new BooleanSetting("linkedWithParent", false); + private YuiId rootId = new YuiId(""); + private YuiId parentId = new YuiId(""); + private boolean linkedWithParent = true; + private List units; - private static final UnitSettingsArraySetting UNITS = new UnitSettingsArraySetting("units"); - private static final WrappersArraySetting WRAPPERS = new WrappersArraySetting("wrappers", new String[5]); + private String clientClassName = "YAHOO.hippo.Wireframe"; - protected static final YuiType TYPE = new YuiType(ROOT_ID, PARENT_ID, LINKED_WITH_PARENT, UNITS, WRAPPERS); - - private IYuiListener unitListener = new IYuiListener() { - private static final long serialVersionUID = 1L; - - public void onEvent(IYuiListener.Event event) { - if (!active) { - notifyListeners(); - } - }; - }; - - private String clientClassName; - private String markupId; - private transient boolean active = false; - public WireframeSettings(IPluginConfig config) { - super(TYPE, config); - clientClassName = config.getString("client.class.name", "YAHOO.hippo.Wireframe"); + units = new ArrayList(5); + for (String position : new String[] {"top", "left", "center", "right", "bottom"}) { + String unitConfig = config.getString(position); + IValueMap unitPars = null; + if (unitConfig != null) { + unitPars = new ValueMap(unitConfig); + units.add(new UnitSettings(position, unitPars)); + } + } + try { + PluginConfigMapper.populate(this, config); + } catch (MappingException e) { + throw new RuntimeException(e); + } + rootId.setId(config.getString("root.id")); } public String getClientClassName() { return clientClassName; } - public void setMarkupId(String markupId) { - this.markupId = markupId; + public void setClientClassName(String clientClassName) { + this.clientClassName = clientClassName; + } - // don't send any notifications - active = true; - try { - YuiId root = getRootElementId(); - root.setParentId(markupId); - for (UnitSettings us : UNITS.get(this)) { - us.setParentMarkupId(markupId); - } - } finally { - active = false; + public void setMarkupId(String markupId) { + rootId.setParentId(markupId); + for (UnitSettings unit : units) { + unit.getId().setParentId(markupId); + unit.getBody().setParentId(markupId); } - notifyListeners(); } - public YuiId getRootElementId() { - return ROOT_ID.get(this); + public YuiId getRootId() { + return rootId; } - public void setParentId(YuiId id) { - PARENT_ID.set(id, this); + public void setParentId(YuiId parentId) { + this.parentId = parentId; } - public boolean isLinkedWithParent() { - return LINKED_WITH_PARENT.get(this); + public YuiId getParentId() { + return parentId; } - public UnitSettings getUnitSettingsByPosition(String position) { - return UNITS.getByPosition(position, this); + public void setLinkedWithParent(boolean linkedWithParent) { + this.linkedWithParent = linkedWithParent; } - public void register(UnitSettings newSettings) { - UnitSettings current = UNITS.getByPosition(newSettings.getPosition(), this); - if (current != null) { - current.removeListener(unitListener); - } - - UNITS.setByPosition(newSettings, this); - newSettings.setWrapperId(current.getWrapperId()); - newSettings.setParentMarkupId(markupId); - - if (newSettings != null) { - newSettings.addListener(unitListener); - } - notifyListeners(); + public boolean isLinkedWithParent() { + return linkedWithParent; } - static class UnitSettingsArraySetting extends SettingsArraySetting { - private static final long serialVersionUID = 1L; - - public UnitSettingsArraySetting(String javascriptKey) { - super(javascriptKey, null); - } - - @Override - public UnitSettings[] newValue() { - return new UnitSettings[] { new UnitSettings(UnitSettings.TOP), new UnitSettings(UnitSettings.BOTTOM), - new UnitSettings(UnitSettings.LEFT), new UnitSettings(UnitSettings.RIGHT), - new UnitSettings(UnitSettings.CENTER) }; - } - - @Override - protected UnitSettings[] getValueFromConfig(IPluginConfig config, YuiObject settings) { - String[] ids = config.getStringArray(getKey()); - UnitSettings[] unitSettings = get(settings); - for (String id : ids) { - UnitSettings us = getByPosition(id, settings); - us.updateValues(new ValueMap(config.getString(id))); - } - return unitSettings; - } - - protected UnitSettings getByPosition(String position, YuiObject settings) { - UnitSettings[] unitSettings = get(settings); - for (UnitSettings setting : unitSettings) { - if (setting.getPosition().equals(position)) { - return setting; - } - } - throw new IllegalArgumentException("No UnitSettings found for position " + position); - } - - protected void setByPosition(UnitSettings us, WireframeSettings ws) { - UnitSettings[] usAr = get(ws); - for (int i = 0; i < usAr.length; i++) { - if (usAr[i].getPosition().equals(us.getPosition())) { - usAr[i] = us; - break; - } - } - } - - public void setFromString(String value, YuiObject settings) { - // TODO:implement - System.out.println("WWWAAARRRNNNIIINNNGGG!!!: SHOULDN'T SEE THIS!"); - } - + public List getUnits() { + return Collections.unmodifiableList(units); } - static class WrappersArraySetting extends StringArraySetting { - private static final long serialVersionUID = 1L; - - public WrappersArraySetting(String javascriptKey, String[] defaultValue) { - super(javascriptKey, defaultValue); - } - - @Override - public boolean isValid(String[] value) { - return false; - } - - @Override - protected String[] getValueFromConfig(IPluginConfig config, YuiObject settings) { - String[] ids = config.getStringArray(getKey()); - WireframeSettings ws = (WireframeSettings) settings; - for (String id : ids) { - UnitSettings setting = ws.getUnitSettingsByPosition(id); - setting.setWrapperId(config.getString(id)); + public UnitSettings getUnit(String position) { + for (UnitSettings unit : units) { + if (unit.getPosition().equals(position)) { + return unit; } - return null; } + return null; } + } Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java (from rev 22037, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -0,0 +1,81 @@ +/* + * Copyright 2009 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.yui.layout; + +import java.io.Serializable; + +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +/** + * The YuiId allows for transparent element id resolution, without having to worry about id clashes on the client. + * + * The idea is really simple. A YuiId consists of an id value, and an optional parentId value. If the parentId is set, + * the YuiId will return an elementId like 'parentId:id', else it will only return the local id. + * + * The id value corresponds to an element in a {@link org.apache.wicket.Component}'s html file through the attribute + * yui:id, the parent id is a normal id-attribute, normally generated by Wicket and added to the YuiId once it's known. + * + * The YAHOO.hippo.LayoutManager module uses YAHOO.hippo.Dom.resolveElement(id) to resolve elements by their YuiId. + * For more info see: + * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/hippodom/hippodom.js + */ +public class YuiId implements Serializable { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private String id; + private String parentId; + + public YuiId(String id) { + this.id = id; + } + + public String getElementId() { + if (parentId != null && !"".equals(parentId)) { + if (id != null && !"".equals(id)) { + return parentId + ":" + id; + } + } else { + return id; + } + return ""; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", id) + .append("parentId", parentId).toString(); + } +} Added: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -0,0 +1,36 @@ +/* + * Copyright 2010 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.yui.layout; + +import net.sf.json.JsonConfig; +import net.sf.json.processors.JsonValueProcessor; + +public class YuiIdProcessor implements JsonValueProcessor { + + public Object processArrayValue(Object value, JsonConfig jsonConfig) { + return null; + } + + public Object processObjectValue(String key, Object value, JsonConfig jsonConfig) { + YuiId id = (YuiId) value; + String elid = id.getElementId(); + if (elid != null && !"".equals(elid)) { + return elid; + } + return null; + } + +} Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html 2010-03-09 15:31:32 UTC (rev 22052) @@ -16,6 +16,9 @@ --> +
    +
    top
    +
    [label here]
    Modified: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -15,11 +15,14 @@ */ package org.hippoecm.frontend.plugins.yui.javascript; +import java.util.Map; +import java.util.TreeMap; + import junit.framework.TestCase; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; -import org.apache.wicket.behavior.IBehavior; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; @@ -33,6 +36,8 @@ import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; +import org.hippoecm.frontend.plugins.yui.layout.YuiId; +import org.hippoecm.frontend.plugins.yui.layout.YuiIdProcessor; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; import org.junit.Test; @@ -61,26 +66,10 @@ } @Test - public void testUnitSettingsInitializationFromConfig() { - IPluginConfig config = new JavaPluginConfig(); - config.put("position", "top"); - config.put("scroll", Boolean.TRUE); - - UnitSettings unitSettings = new UnitSettings(config); - assertTrue("top".equals(unitSettings.getPosition())); - - JSONObject wfObject = JSONObject.fromObject(unitSettings.toScript()); - assertTrue("top".equals(wfObject.get("position"))); - assertTrue(Boolean.TRUE.equals(wfObject.get("scroll"))); - } - - @Test public void testUnitSettingsInitializationFromString() { UnitSettings unitSettings = new UnitSettings("top", new ValueMap("scroll=true")); assertTrue("top".equals(unitSettings.getPosition())); - JSONObject wfObject = JSONObject.fromObject(unitSettings.toScript()); - assertTrue("top".equals(wfObject.get("position"))); - assertTrue(Boolean.TRUE.equals(wfObject.get("scroll"))); + assertTrue(Boolean.TRUE.equals(unitSettings.isScroll())); } public static class TestLabel extends Label { @@ -108,14 +97,16 @@ add(new WebAppBehavior(new WebAppSettings())); IPluginConfig config = new JavaPluginConfig(); - config.put("wrappers", new String[] { "center" }); - config.put("center", "center-wrapper"); + config.put("units", new String[] { "center", "top" }); + config.put("top", "id=top,body=top-body"); + config.put("center", "id=center-wrapper"); + config.put("linked.with.parent", false); wfSettings = new WireframeSettings(config); add(new WireframeBehavior(wfSettings)); Label panel; add(panel = new TestLabel("label", "label1", new Model("test"))); - panel.add(new UnitBehavior(new UnitSettings("center", new ValueMap("")))); + panel.add(new UnitBehavior("center")); add(new Link("action") { private static final long serialVersionUID = 1L; @@ -123,7 +114,7 @@ @Override public void onClick() { Label label = new TestLabel("label", "label2", new Model("testing 1 2 3")); - label.add(new UnitBehavior(new UnitSettings("center", new ValueMap("scroll=true")))); + label.add(new UnitBehavior("center")); TestPage.this.replace(label); } @@ -141,24 +132,29 @@ TestPage page = (TestPage) tester.startPage(TestPage.class); WireframeSettings wfSettings = page.getWireframeSettings(); - System.out.println(wfSettings.toScript()); - JSONObject wfObject = JSONObject.fromObject(wfSettings.toScript()); +// System.out.println(wfSettings.toScript()); + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); assertTrue("".equals(wfObject.get("rootId"))); JSONArray units = wfObject.getJSONArray("units"); - JSONObject centerObject = null; + Map unitMap = new TreeMap(); for (int i = 0; i < units.size(); i++) { JSONObject unitObject = units.getJSONObject(i); - if ("center".equals(unitObject.get("position"))) { - centerObject = unitObject; - break; - } + unitMap.put((String) unitObject.get("position"), unitObject); } + + JSONObject centerObject = unitMap.get("center"); assertNotNull(centerObject); assertTrue("center".equals(centerObject.get("position"))); assertTrue("id01:center-wrapper".equals(centerObject.get("id"))); assertTrue("label1".equals(centerObject.get("body"))); assertTrue(Boolean.FALSE.equals(centerObject.get("scroll"))); + + JSONObject topObject = unitMap.get("top"); + assertTrue("id01:top".equals(topObject.get("id"))); + assertTrue("id01:top-body".equals(topObject.get("body"))); } @Test @@ -170,7 +166,9 @@ TestPage page = (TestPage) tester.getLastRenderedPage(); WireframeSettings wfSettings = page.getWireframeSettings(); - JSONObject wfObject = JSONObject.fromObject(wfSettings.toScript()); + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); assertTrue("".equals(wfObject.get("rootId"))); JSONArray units = wfObject.getJSONArray("units"); Added: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -0,0 +1,28 @@ +package org.hippoecm.frontend.plugins.yui.layout; + +import static org.junit.Assert.assertEquals; +import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; + +import org.junit.Test; + +public class YuiIdTest { + + public static class TestSetting { + + public YuiId getId() { + YuiId id = new YuiId("child"); + id.setParentId("parent"); + return id; + } + } + + @Test + public void testSerialization() { + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + + String result = JSONObject.fromObject(new TestSetting(), jsonConfig).toString(); + assertEquals("{\"id\":\"parent:child\"}", result); + } +} Property changes on: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -20,8 +20,8 @@ import java.util.Map; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.PropertyUtils; -import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.apache.commons.beanutils.BeanUtilsBean; +import org.apache.wicket.util.value.IValueMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,16 +33,17 @@ static final Logger log = LoggerFactory.getLogger(PluginConfigMapper.class); - public static void populate(Object bean, IPluginConfig config) throws MappingException { + public static void populate(Object bean, IValueMap config) throws MappingException { try { Map entries = BeanUtils.describe(bean); + BeanUtilsBean bub = BeanUtilsBean.getInstance(); for (Map.Entry entry : entries.entrySet()) { if ("class".equals(entry.getKey())) { continue; } String configKey = toConfigKey(entry.getKey()); if (config.containsKey(configKey)) { - PropertyUtils.setSimpleProperty(bean, entry.getKey(), config.get(configKey)); + bub.setProperty(bean, entry.getKey(), config.get(configKey)); } } } catch (IllegalAccessException e) { Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -26,6 +26,8 @@ import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.service.render.RenderService; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; import org.hippoecm.frontend.widgets.Pinger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +55,12 @@ context.unregisterService(this, modelId); } - PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("yui.config")); + PageLayoutSettings plSettings = new PageLayoutSettings(); + try { + PluginConfigMapper.populate(plSettings, config.getPluginConfig("yui.config")); + } catch (MappingException e) { + throw new RuntimeException(e); + } add(new PageLayoutBehavior(plSettings)); } Modified: hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml 2010-03-09 15:31:32 UTC (rev 22052) @@ -244,10 +244,6 @@ id=navigator-center,body=navigator-center-body,scroll=true - - top - center -     Modified: hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java =================================================================== --- hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java 2010-03-09 15:31:32 UTC (rev 22052) @@ -49,4 +49,20 @@ assertEquals(true, bean.isTestBool()); assertEquals("value", bean.getTestString()); } + + @Test + public void testStringValues() throws MappingException { + JavaPluginConfig jpc = new JavaPluginConfig(); + jpc.put("test.int", "1"); + jpc.put("test.bool", "true"); + jpc.put("test.string", "value"); + + MappingTestBean bean = new MappingTestBean(); + PluginConfigMapper.populate(bean, jpc); + + assertEquals(1, bean.getTestInt()); + assertEquals(true, bean.isTestBool()); + assertEquals("value", bean.getTestString()); + } + } Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-09 15:31:32 UTC (rev 22052) @@ -66,10 +66,6 @@ browse-perspective-wrapper - - left - center - @@ -142,26 +138,21 @@ frontend:pluginconfig - - id=navigator-center,body=navigator-center-body,width=250 + + id=navigator-top,height=25px,resize=false id=navigator-left,body=navigator-left-body,width=200,zindex=2,resize=true + + id=navigator-center,body=navigator-center-body,width=250 + true navigator-wrapper - - id=navigator-top,height=25px,resize=false - - - top - left - center - @@ -321,8 +312,11 @@ frontend:pluginconfig + + id=tabbed-panel-layout-top,height=25,gutter=0px 0px 0px 0px + - tabbed-panel-layout-center + id=tabbed-panel-layout-center,gutter=0px 0px 0px 0px true @@ -330,13 +324,6 @@ tabbed-panel-layout - - tabbed-panel-layout-top - - - top - center - @@ -352,17 +339,9 @@ org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - - frontend:pluginconfig - - - gutter=0px 0px 0px 0px - - - center - - + + center + @@ -377,17 +356,9 @@ org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - - frontend:pluginconfig - - - height=25,gutter=0px 0px 0px 0px - - - top - - + + top + Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml 2010-03-09 15:31:32 UTC (rev 22052) @@ -86,12 +86,6 @@ dashboard-perspective-wrapper - - top - left - center - right - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-09 15:31:32 UTC (rev 22052) @@ -80,12 +80,8 @@ editor-perspective-wrapper - id=editor-perspective-top,height=24,zindex=1 + id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 - - top - center - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-09 15:31:32 UTC (rev 22052) @@ -71,12 +71,8 @@ editor-perspective-wrapper - id=editor-perspective-top,height=24,zindex=1 + id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 - - top - center - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-09 14:28:01 UTC (rev 22051) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-09 15:31:32 UTC (rev 22052) @@ -397,9 +397,6 @@ frontend:plugin - - service.center - org.hippoecm.frontend.plugins.cms.root.RootPlugin @@ -426,29 +423,15 @@ ie - - - frontend:pluginconfig - - - 0px 0px 0px 0px - - - 0px 0px 0px 0px - - - 50 - - frontend:pluginconfig - tabbed-panel-layout-center + id=tabbed-panel-layout-center,height=1000 - tabbed-panel-layout-left + id=tabbed-panel-layout-left,width=50 true @@ -456,33 +439,7 @@ tabbed-panel-layout - - left - center - - - - frontend:pluginconfig - - - height=1000 - - - center - - - - - frontend:pluginconfig - - - width=50 - - - left - - @@ -542,10 +499,6 @@ id=hippo-controlpanel-perspective-top,body=hippo-controlpanel-perspective-top-body,height=35 - - top - center - From svn-logs at hippocms.org Tue Mar 9 16:33:08 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Tue Mar 9 16:37:32 2010 Subject: [HippoRepos-dev] [22053] hippo-ecm: HREPTWO-3953: remove listeners from yui object Message-ID: <20100309153308.3B4981C020@svn.vm.castaserver.com> Revision: 22053 Author: fvlankvelt Date: 2010-03-09 16:33:07 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3953: remove listeners from yui object They're not used any more. Modified Paths: -------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-09 15:31:32 UTC (rev 22052) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-09 15:33:07 UTC (rev 22053) @@ -16,13 +16,12 @@ package org.hippoecm.frontend.plugins.yui.javascript; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import org.apache.wicket.IClusterable; import org.apache.wicket.util.value.IValueMap; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.util.PluginConfigMapper; /** * Base class for passing configuration to a YUI component on the client. @@ -39,11 +38,9 @@ private YuiType type; private Map, Object> settings; - private List listeners; public YuiObject(YuiType type) { this.type = type; - listeners = new LinkedList(); settings = new HashMap, Object>(); for (Setting setting : type.getProperties()) { this.settings.put(setting, setting.newValue()); @@ -78,31 +75,8 @@ void set(Setting key, Object value) { settings.put(key, value); - notifyListeners(); } - public void addListener(IYuiListener listener) { - listeners.add(listener); - } - - public void removeListener(IYuiListener listener) { - listeners.remove(listener); - } - - protected void notifyListeners() { - if (listeners.size() > 0) { - IYuiListener.Event event = new IYuiListener.Event() { - @Override - public YuiObject getSource() { - return YuiObject.this; - } - }; - for (IYuiListener listener : listeners) { - listener.onEvent(event); - } - } - } - public String toScript() { StringBuilder sb = new StringBuilder(); sb.append('{'); From svn-logs at hippocms.org Tue Mar 9 17:35:18 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 9 17:39:42 2010 Subject: [HippoRepos-dev] [22054] hippo-ecm/trunk: HREPTWO-3945, HREPTWO-3946: Message-ID: <20100309163518.535A81C020@svn.vm.castaserver.com> Revision: 22054 Author: bvanhalderen Date: 2010-03-09 17:35:17 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3945, HREPTWO-3946: - only allow upload of images, pdf and postscript where the content matches the mime-type. - this for shortcut upload - as for image upload using context menu (add image/asset) - as for uploading image when editing a document - add translated error message when content is invalid - remove/fix translation which contained argument which wasn't actuall supplied - removed NPE from EditPerspective when closing tab. Modified Paths: -------------- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java hippo-ecm/trunk/addon/editor/frontend/pom.xml hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-09 16:35:17 UTC (rev 22054) @@ -128,7 +128,7 @@ feedbackShown = false; updateTop = true; } - if (updateTop && isVisibleInHierarchy()) { + if (updateTop && isVisibleInHierarchy() && target != null) { String topId = topSettings.getId().getElementId(); target.appendJavascript("YAHOO.hippo.LayoutManager.findLayoutUnit(YAHOO.util.Dom.get('" + topId + "')).set('height', " + topSettings.getHeight() + ");"); Modified: hippo-ecm/trunk/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/pom.xml 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/editor/frontend/pom.xml 2010-03-09 16:35:17 UTC (rev 22054) @@ -71,6 +71,11 @@ hippo-ecm-addon-workflow 2.13.00-SNAPSHOT + + org.hippoecm + hippo-ecm-addon-gallery-frontend + 2.13.00-SNAPSHOT + org.hippoecm Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-09 16:35:17 UTC (rev 22054) @@ -34,6 +34,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.gallery.ImageUtils; import org.hippoecm.frontend.service.render.RenderPlugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,8 +91,9 @@ node.setProperty("jcr:mimeType", type); node.setProperty("jcr:data", upload.getInputStream()); node.setProperty("jcr:lastModified", Calendar.getInstance()); + new ImageUtils().validateResource(node, fileName); } catch (RepositoryException ex) { - // FIXME: report back to user + error(ex); log.error(ex.getMessage()); } catch (IOException ex) { // FIXME: report back to user Modified: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java 2010-03-09 16:35:17 UTC (rev 22054) @@ -133,6 +133,7 @@ mimetype = upload.getContentType(); InputStream istream = upload.getInputStream(); WorkflowManager manager = ((UserSession) Session.get()).getWorkflowManager(); + HippoNode node = null; try { WorkflowDescriptorModel workflowDescriptorModel = (WorkflowDescriptorModel) GalleryWorkflowPlugin.this .getDefaultModel(); @@ -141,26 +142,45 @@ String nodeName = getNodeNameCodec().encode(filename); String localName = getLocalizeCodec().encode(filename); Document document = workflow.createGalleryItem(nodeName, type); - HippoNode node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); + node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); DefaultWorkflow defaultWorkflow = (DefaultWorkflow) manager.getWorkflow("core", node); if(!node.getLocalizedName().equals(localName)) { defaultWorkflow.localizeName(localName); } - ImageUtils.galleryProcessor(getPluginConfig()).makeImage(node, istream, mimetype, filename); - node.getSession().save(); } catch (WorkflowException ex) { GalleryWorkflowPlugin.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", GalleryWorkflowPlugin.this, null) - .getString()); + error(ex); } catch (MappingException ex) { GalleryWorkflowPlugin.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", GalleryWorkflowPlugin.this, null) - .getString()); + error(ex); } catch (RepositoryException ex) { GalleryWorkflowPlugin.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", GalleryWorkflowPlugin.this, null) - .getString()); + error(ex); } + if (node != null) { + try { + ImageUtils.galleryProcessor(getPluginConfig()).makeImage(node, istream, mimetype, filename); + node.getSession().save(); + } catch (RepositoryException ex) { + GalleryWorkflowPlugin.log.error(ex.getMessage()); + error(ex); + try { + DefaultWorkflow defaultWorkflow = (DefaultWorkflow)manager.getWorkflow("core", node); + defaultWorkflow.delete(); + } catch (WorkflowException e) { + GalleryWorkflowPlugin.log.error(e.getMessage()); + } catch (MappingException e) { + GalleryWorkflowPlugin.log.error(e.getMessage()); + } catch (RepositoryException e) { + GalleryWorkflowPlugin.log.error(e.getMessage()); + } + try { + node.getSession().refresh(false); + } catch(RepositoryException e) { + // deliberate ignore + } + } + } } catch (IOException ex) { GalleryWorkflowPlugin.log.info("upload of image truncated"); error((new StringResourceModel("upload-failed-label", GalleryWorkflowPlugin.this, null).getString())); Modified: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties =================================================================== --- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties 2010-03-09 16:35:17 UTC (rev 22054) @@ -3,7 +3,6 @@ add-asset: Add file... add-image-label: Add an image to the gallery add-file-label: Add a file to the library -upload-failed-label: Upload failed. The error reads: +upload-failed-label: Upload failed. no-file-uploaded-label: Nothing uploaded -workflow-error-label: Workflow error: upload-successful-label: Success! Modified: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties =================================================================== --- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties 2010-03-09 16:35:17 UTC (rev 22054) @@ -3,7 +3,6 @@ add-asset: Voeg bestand toe... add-image-label: Voeg een plaatje toe aan de beeldbank add-file-label: Voeg een bestand toe aan de bibliotheek -upload-failed-label: Upload failed. De foutmelding is: +upload-failed-label: Upload failed. no-file-uploaded-label: Niks toegevoegd -workflow-error-label: Werkstroom fout: upload-successful-label: Klaar! Modified: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java =================================================================== --- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-09 16:35:17 UTC (rev 22054) @@ -19,10 +19,12 @@ import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; +import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; import java.util.Calendar; import java.util.Iterator; @@ -38,6 +40,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; +import javax.jcr.ValueFormatException; import javax.jcr.nodetype.NodeDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -241,6 +244,7 @@ primaryChild.setProperty("jcr:mimeType", mimeType); primaryChild.setProperty("jcr:data", istream); } + validateResource(primaryChild, filename); for (NodeDefinition childDef : node.getPrimaryNodeType().getChildNodeDefinitions()) { if (childDef.getDefaultPrimaryType() != null && childDef.getDefaultPrimaryType().isNodeType("hippo:resource")) { makeRegularImage(node, childDef.getName(), @@ -249,10 +253,65 @@ primaryChild.getProperty("jcr:lastModified").getDate()); } } - String description = ImageInfo.analyse(filename, primaryChild.getProperty("jcr:data").getStream()); makeThumbnailImage(primaryChild, primaryChild.getProperty("jcr:data").getStream(), primaryChild.getProperty("jcr:mimeType").getString()); } + public void validateResource(Node resource, String filename) throws ValueFormatException, RepositoryException { + try { + String mimeType; + try { + mimeType = (resource.hasProperty("jcr:mimeType") ? resource.getProperty("jcr:mimeType").getString() : ""); + mimeType = mimeType.toLowerCase(); + if(mimeType.equals(MIME_IMAGE_PJPEG)) { + mimeType = MIME_IMAGE_JPEG; + } + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (mimeType.startsWith("image/")) { + ImageInfo imageInfo = new ImageInfo(); + try { + imageInfo.setInput(resource.getProperty("jcr:data").getStream()); + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (imageInfo.check()) { + if(!imageInfo.getMimeType().equalsIgnoreCase(mimeType)) { + throw new ValueFormatException("mismatch image mime type"); + } + } else { + throw new ValueFormatException("impermissable image type content"); + } + } else if (mimeType.equals("application/pdf")) { + String line; + try { + line = new BufferedReader(new InputStreamReader(resource.getProperty("jcr:data").getStream())).readLine().toUpperCase(); + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (!line.startsWith("%PDF-")) { + throw new ValueFormatException("impermissable pdf type content"); + } + } else if (mimeType.equals("application/postscript")) { + String line; + try { + line = new BufferedReader(new InputStreamReader(resource.getProperty("jcr:data").getStream())).readLine().toUpperCase(); + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (!line.startsWith("%!")) { + throw new ValueFormatException("impermissable postscript type content"); + } + } else { + // This method can be overridden to allow more such checks on content type. if such an override + // wants to be really strict and not allow unknown content, the following thrown exception is to be included + // throw new ValueFormatException("impermissable unrecognized type content"); + } + } catch (IOException ex) { + throw new ValueFormatException("impermissable unknown type content"); + } + } + protected void makeRegularImage(Node node, String name, InputStream istream, String mimeType, Calendar lastModified) throws RepositoryException { if (!node.hasNode(name)) { Node child = node.addNode(name); Modified: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java =================================================================== --- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java 2010-03-09 16:35:17 UTC (rev 22054) @@ -125,6 +125,7 @@ mimetype = upload.getContentType(); InputStream istream = upload.getInputStream(); WorkflowManager manager = ((UserSession) Session.get()).getWorkflowManager(); + HippoNode node = null; try { Node galleryNode = uploadDialog.getGalleryNode(); GalleryWorkflow workflow = (GalleryWorkflow) manager.getWorkflow(this.uploadDialog @@ -132,25 +133,48 @@ String nodeName = uploadDialog.getNodeNameCodec().encode(filename); String localName = uploadDialog.getLocalizeCodec().encode(filename); Document document = workflow.createGalleryItem(nodeName, type); - HippoNode node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); + node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); DefaultWorkflow defaultWorkflow = (DefaultWorkflow) manager.getWorkflow("core", node); if(!node.getLocalizedName().equals(localName)) { defaultWorkflow.localizeName(localName); } - GalleryProcessor processor = ImageUtils.galleryProcessor(uploadDialog.pluginConfig); - processor.makeImage(node, istream, mimetype, filename); - node.getSession().save(); - uploadDialog.getWizardModel().next(); } catch (WorkflowException ex) { Gallery.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", this, null).getString()); + error(ex); } catch (MappingException ex) { Gallery.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", this, null).getString()); + error(ex); } catch (RepositoryException ex) { Gallery.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", this, null).getString()); + error(ex); } + if (node != null) { + try { + GalleryProcessor processor = ImageUtils.galleryProcessor(uploadDialog.pluginConfig); + processor.makeImage(node, istream, mimetype, filename); + node.getSession().save(); + uploadDialog.getWizardModel().next(); + Session.get().getFeedbackMessages().clear(); + } catch (RepositoryException ex) { + Gallery.log.error(ex.getMessage()); + error(ex); + try { + DefaultWorkflow defaultWorkflow = (DefaultWorkflow)manager.getWorkflow("core", node); + defaultWorkflow.delete(); + } catch (WorkflowException e) { + Gallery.log.error(e.getMessage()); + } catch (MappingException e) { + Gallery.log.error(e.getMessage()); + } catch (RepositoryException e) { + Gallery.log.error(e.getMessage()); + } + try { + node.getSession().refresh(false); + } catch(RepositoryException e) { + // deliberate ignore + } + } + } } catch (IOException ex) { Gallery.log.info("upload of image truncated"); error((new StringResourceModel("upload-failed-label", this, null).getString())); Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties 2010-03-09 16:35:17 UTC (rev 22054) @@ -2,6 +2,7 @@ cancel=Cancel delete-message-extended: Delete exception=An error occurred, please retry. +exception,javax.jcr.ValueFormatException=Invalid content. exception,org.hippoecm.repository.api.WorkflowException=The action failed. exception,org.hippoecm.repository.api.WorkflowException,Cannot\ create\ new\ namespace=Cannot create new namespace exception,org.hippoecm.repository.api.WorkflowException,No\ name\ for\ destination\ given=No name for destination given. Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties 2010-03-09 15:33:07 UTC (rev 22053) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties 2010-03-09 16:35:17 UTC (rev 22054) @@ -2,6 +2,7 @@ cancel=Annuleer delete-message-extended: Verwijder exception=Er heeft een fout plaatsgevonden, probeer opnieuw. +exception,javax.jcr.ValueFormatException=Ongeldige invoer. exception,org.hippoecm.repository.api.WorkflowException=The actie is mislukt. exception,org.hippoecm.repository.api.WorkflowException,Cannot\ create\ new\ namespace=Kan nieuwe namespace niet aanmaken exception,org.hippoecm.repository.api.WorkflowException,No\ name\ for\ destination\ given=Geen nieuwe naam opgegeven. From svn-logs at hippocms.org Tue Mar 9 17:35:22 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 9 17:39:47 2010 Subject: [HippoRepos-dev] [22055] hippo-ecm/trunk: HREPTWO-3955: for non-images, add a content-disposition to make the user aware of possible harmfull content Message-ID: <20100309163522.D72EF1C020@svn.vm.castaserver.com> Revision: 22055 Author: bvanhalderen Date: 2010-03-09 17:35:22 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3955: for non-images, add a content-disposition to make the user aware of possible harmfull content Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java 2010-03-09 16:35:17 UTC (rev 22054) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java 2010-03-09 16:35:22 UTC (rev 22055) @@ -18,11 +18,13 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.apache.wicket.Response; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.NonCachingImage; import org.apache.wicket.markup.html.link.ResourceLink; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.Model; +import org.apache.wicket.protocol.http.WebResponse; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.standards.util.ByteSizeFormatter; @@ -54,6 +56,12 @@ Fragment fragment = new Fragment("fragment", "unknown", this); try { Node node = getModelObject(); + final String filename; + if(node.getDefinition().getName().equals("*")) { + filename = node.getName(); + } else { + filename = node.getParent().getName(); + } String mimeType = node.getProperty("jcr:mimeType").getString(); if (mimeType.indexOf('/') > 0) { String category = mimeType.substring(0, mimeType.indexOf('/')); @@ -64,7 +72,14 @@ fragment = new Fragment("fragment", "embed", this); fragment.add(new Label("filesize", new Model(formatter.format(resource.length())))); fragment.add(new Label("mimetype", new Model(resource.getContentType()))); - fragment.add(new ResourceLink("link", new JcrResource(resource))); + fragment.add(new ResourceLink("link", new JcrResource(resource) { + @Override + protected void configureResponse(Response response) { + if(response instanceof WebResponse) { + ((WebResponse)response).setHeader("Content-Disposition", "attachment; filename=" + filename); + } + } + })); } } } catch (RepositoryException ex) { Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java 2010-03-09 16:35:17 UTC (rev 22054) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java 2010-03-09 16:35:22 UTC (rev 22055) @@ -118,6 +118,10 @@ response.setContentType(mimeType); } + if (!mimeType.toLowerCase().startsWith("image/")) { + response.setHeader("Content-Disposition", "attachment; filename=" + node.getName()); + } + // Make sure it is not cached by a client response.setHeader("Expires", "Mon, 26 Jul 1997 05:00:00 GMT"); response.setHeader("Cache-Control", "no-cache, must-revalidate"); From svn-logs at hippocms.org Tue Mar 9 17:35:24 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 9 17:39:52 2010 Subject: [HippoRepos-dev] [22056] hippo-ecm: HREPTWO-3947: escape the document names from the activity log Message-ID: <20100309163524.7B6011C020@svn.vm.castaserver.com> Revision: 22056 Author: bvanhalderen Date: 2010-03-09 17:35:24 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3947: escape the document names from the activity log Modified Paths: -------------- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java hippo-ecm/trunk/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java Modified: hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java =================================================================== --- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java 2010-03-09 16:35:22 UTC (rev 22055) +++ hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java 2010-03-09 16:35:24 UTC (rev 22056) @@ -37,7 +37,7 @@ public BreadCrumbComponent(String id, int index, IBreadCrumbModel breadCrumbModel, final IBreadCrumbParticipant participant, boolean enableLink) { super(id); - add(new Label("sep", (index > 0) ? "" : "").setEscapeModelStrings(false).setRenderBodyOnly(true)); + add(new Label("sep", "").setRenderBodyOnly(true)); BreadCrumbLink link = new BreadCrumbLink("link", breadCrumbModel) { private static final long serialVersionUID = 1L; Modified: hippo-ecm/trunk/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java =================================================================== --- hippo-ecm/trunk/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java 2010-03-09 16:35:22 UTC (rev 22055) +++ hippo-ecm/trunk/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java 2010-03-09 16:35:24 UTC (rev 22056) @@ -22,6 +22,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.wicket.Component; import org.apache.wicket.model.IComponentAssignedModel; import org.apache.wicket.model.IModel; @@ -43,13 +44,13 @@ private String time; private String method; private String user; - private IModel nameModel; + private IModel nameModel; public EventModel(JcrNodeModel eventNode) { this(eventNode, null); } - public EventModel(JcrNodeModel eventNode, IModel nameModel) { + public EventModel(JcrNodeModel eventNode, IModel nameModel) { Node node = eventNode.getNode(); try { if (node == null || !node.isNodeType("hippolog:item")) { @@ -184,8 +185,10 @@ public Object getObject() { if (nameModel != null) { + String name = nameModel.getObject(); + name = StringEscapeUtils.escapeHtml(name); return new StringResourceModel(time, component, null, "").getString() - + new StringResourceModel(method, component, null, new Object[] { user, nameModel.getObject() }).getString(); + + new StringResourceModel(method, component, null, new Object[] { user, name }).getString(); } else { return new StringResourceModel(time, component, null, "").getString() + new StringResourceModel(method, component, null, new Object[] { user }).getString(); From svn-logs at hippocms.org Tue Mar 9 17:37:50 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 9 17:42:17 2010 Subject: [HippoRepos-dev] [22058] hippo-ecm: HREPTWO-3945, HREPTWO-3946: backport Message-ID: <20100309163750.B01971C020@svn.vm.castaserver.com> Revision: 22058 Author: bvanhalderen Date: 2010-03-09 17:37:49 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3945, HREPTWO-3946: backport Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-09 16:37:49 UTC (rev 22058) @@ -124,7 +124,7 @@ feedbackShown = false; updateTop = true; } - if (updateTop && isVisibleInHierarchy()) { + if (updateTop && isVisibleInHierarchy() && target != null) { String topId = topSettings.getElementId(); target.appendJavascript("YAHOO.hippo.LayoutManager.findLayoutUnit(YAHOO.util.Dom.get('" + topId + "')).set('height', " + topSettings.getHeight() + ");"); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-09 16:37:49 UTC (rev 22058) @@ -71,6 +71,11 @@ hippo-ecm-addon-workflow 2.12.07-SNAPSHOT + + org.hippoecm + hippo-ecm-addon-gallery-frontend + 2.13.00-SNAPSHOT + org.hippoecm Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-09 16:37:49 UTC (rev 22058) @@ -34,6 +34,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.gallery.ImageUtils; import org.hippoecm.frontend.service.render.RenderPlugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,8 +91,9 @@ node.setProperty("jcr:mimeType", type); node.setProperty("jcr:data", upload.getInputStream()); node.setProperty("jcr:lastModified", Calendar.getInstance()); + new ImageUtils().validateResource(node, fileName); } catch (RepositoryException ex) { - // FIXME: report back to user + error(ex); log.error(ex.getMessage()); } catch (IOException ex) { // FIXME: report back to user Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java 2010-03-09 16:37:49 UTC (rev 22058) @@ -133,6 +133,7 @@ mimetype = upload.getContentType(); InputStream istream = upload.getInputStream(); WorkflowManager manager = ((UserSession) Session.get()).getWorkflowManager(); + HippoNode node = null; try { WorkflowDescriptorModel workflowDescriptorModel = (WorkflowDescriptorModel) GalleryWorkflowPlugin.this .getDefaultModel(); @@ -141,26 +142,45 @@ String nodeName = getNodeNameCodec().encode(filename); String localName = getLocalizeCodec().encode(filename); Document document = workflow.createGalleryItem(nodeName, type); - HippoNode node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); + node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); DefaultWorkflow defaultWorkflow = (DefaultWorkflow) manager.getWorkflow("core", node); if(!node.getLocalizedName().equals(localName)) { defaultWorkflow.localizeName(localName); } - ImageUtils.galleryProcessor(getPluginConfig()).makeImage(node, istream, mimetype, filename); - node.getSession().save(); } catch (WorkflowException ex) { GalleryWorkflowPlugin.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", GalleryWorkflowPlugin.this, null) - .getString()); + error(ex); } catch (MappingException ex) { GalleryWorkflowPlugin.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", GalleryWorkflowPlugin.this, null) - .getString()); + error(ex); } catch (RepositoryException ex) { GalleryWorkflowPlugin.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", GalleryWorkflowPlugin.this, null) - .getString()); + error(ex); } + if (node != null) { + try { + ImageUtils.galleryProcessor(getPluginConfig()).makeImage(node, istream, mimetype, filename); + node.getSession().save(); + } catch (RepositoryException ex) { + GalleryWorkflowPlugin.log.error(ex.getMessage()); + error(ex); + try { + DefaultWorkflow defaultWorkflow = (DefaultWorkflow)manager.getWorkflow("core", node); + defaultWorkflow.delete(); + } catch (WorkflowException e) { + GalleryWorkflowPlugin.log.error(e.getMessage()); + } catch (MappingException e) { + GalleryWorkflowPlugin.log.error(e.getMessage()); + } catch (RepositoryException e) { + GalleryWorkflowPlugin.log.error(e.getMessage()); + } + try { + node.getSession().refresh(false); + } catch(RepositoryException e) { + // deliberate ignore + } + } + } } catch (IOException ex) { GalleryWorkflowPlugin.log.info("upload of image truncated"); error((new StringResourceModel("upload-failed-label", GalleryWorkflowPlugin.this, null).getString())); Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.properties 2010-03-09 16:37:49 UTC (rev 22058) @@ -3,7 +3,6 @@ add-asset: Add file... add-image-label: Add an image to the gallery add-file-label: Add a file to the library -upload-failed-label: Upload failed. The error reads: +upload-failed-label: Upload failed. no-file-uploaded-label: Nothing uploaded -workflow-error-label: Workflow error: upload-successful-label: Success! Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin_nl.properties 2010-03-09 16:37:49 UTC (rev 22058) @@ -3,7 +3,6 @@ add-asset: Voeg bestand toe... add-image-label: Voeg een plaatje toe aan de beeldbank add-file-label: Voeg een bestand toe aan de bibliotheek -upload-failed-label: Upload failed. De foutmelding is: +upload-failed-label: Upload failed. no-file-uploaded-label: Niks toegevoegd -workflow-error-label: Werkstroom fout: upload-successful-label: Klaar! Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-09 16:37:49 UTC (rev 22058) @@ -19,10 +19,12 @@ import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; +import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; import java.util.Calendar; import java.util.Iterator; @@ -38,6 +40,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; +import javax.jcr.ValueFormatException; import javax.jcr.nodetype.NodeDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -241,6 +244,7 @@ primaryChild.setProperty("jcr:mimeType", mimeType); primaryChild.setProperty("jcr:data", istream); } + validateResource(primaryChild, filename); for (NodeDefinition childDef : node.getPrimaryNodeType().getChildNodeDefinitions()) { if (childDef.getDefaultPrimaryType() != null && childDef.getDefaultPrimaryType().isNodeType("hippo:resource")) { makeRegularImage(node, childDef.getName(), @@ -249,10 +253,65 @@ primaryChild.getProperty("jcr:lastModified").getDate()); } } - String description = ImageInfo.analyse(filename, primaryChild.getProperty("jcr:data").getStream()); makeThumbnailImage(primaryChild, primaryChild.getProperty("jcr:data").getStream(), primaryChild.getProperty("jcr:mimeType").getString()); } + public void validateResource(Node resource, String filename) throws ValueFormatException, RepositoryException { + try { + String mimeType; + try { + mimeType = (resource.hasProperty("jcr:mimeType") ? resource.getProperty("jcr:mimeType").getString() : ""); + mimeType = mimeType.toLowerCase(); + if(mimeType.equals(MIME_IMAGE_PJPEG)) { + mimeType = MIME_IMAGE_JPEG; + } + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (mimeType.startsWith("image/")) { + ImageInfo imageInfo = new ImageInfo(); + try { + imageInfo.setInput(resource.getProperty("jcr:data").getStream()); + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (imageInfo.check()) { + if(!imageInfo.getMimeType().equalsIgnoreCase(mimeType)) { + throw new ValueFormatException("mismatch image mime type"); + } + } else { + throw new ValueFormatException("impermissable image type content"); + } + } else if (mimeType.equals("application/pdf")) { + String line; + try { + line = new BufferedReader(new InputStreamReader(resource.getProperty("jcr:data").getStream())).readLine().toUpperCase(); + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (!line.startsWith("%PDF-")) { + throw new ValueFormatException("impermissable pdf type content"); + } + } else if (mimeType.equals("application/postscript")) { + String line; + try { + line = new BufferedReader(new InputStreamReader(resource.getProperty("jcr:data").getStream())).readLine().toUpperCase(); + } catch (RepositoryException ex) { + throw new RepositoryException("unexpected error validating mime type", ex); + } + if (!line.startsWith("%!")) { + throw new ValueFormatException("impermissable postscript type content"); + } + } else { + // This method can be overridden to allow more such checks on content type. if such an override + // wants to be really strict and not allow unknown content, the following thrown exception is to be included + // throw new ValueFormatException("impermissable unrecognized type content"); + } + } catch (IOException ex) { + throw new ValueFormatException("impermissable unknown type content"); + } + } + protected void makeRegularImage(Node node, String name, InputStream istream, String mimeType, Calendar lastModified) throws RepositoryException { if (!node.hasNode(name)) { Node child = node.addNode(name); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadForm.java 2010-03-09 16:37:49 UTC (rev 22058) @@ -125,6 +125,7 @@ mimetype = upload.getContentType(); InputStream istream = upload.getInputStream(); WorkflowManager manager = ((UserSession) Session.get()).getWorkflowManager(); + HippoNode node = null; try { Node galleryNode = uploadDialog.getGalleryNode(); GalleryWorkflow workflow = (GalleryWorkflow) manager.getWorkflow(this.uploadDialog @@ -132,25 +133,48 @@ String nodeName = uploadDialog.getNodeNameCodec().encode(filename); String localName = uploadDialog.getLocalizeCodec().encode(filename); Document document = workflow.createGalleryItem(nodeName, type); - HippoNode node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); + node = (HippoNode) (((UserSession) Session.get())).getJcrSession().getNodeByUUID(document.getIdentity()); DefaultWorkflow defaultWorkflow = (DefaultWorkflow) manager.getWorkflow("core", node); if(!node.getLocalizedName().equals(localName)) { defaultWorkflow.localizeName(localName); } - GalleryProcessor processor = ImageUtils.galleryProcessor(uploadDialog.pluginConfig); - processor.makeImage(node, istream, mimetype, filename); - node.getSession().save(); - uploadDialog.getWizardModel().next(); } catch (WorkflowException ex) { Gallery.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", this, null).getString()); + error(ex); } catch (MappingException ex) { Gallery.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", this, null).getString()); + error(ex); } catch (RepositoryException ex) { Gallery.log.error(ex.getMessage()); - error(new StringResourceModel("workflow-error-label", this, null).getString()); + error(ex); } + if (node != null) { + try { + GalleryProcessor processor = ImageUtils.galleryProcessor(uploadDialog.pluginConfig); + processor.makeImage(node, istream, mimetype, filename); + node.getSession().save(); + uploadDialog.getWizardModel().next(); + Session.get().getFeedbackMessages().clear(); + } catch (RepositoryException ex) { + Gallery.log.error(ex.getMessage()); + error(ex); + try { + DefaultWorkflow defaultWorkflow = (DefaultWorkflow)manager.getWorkflow("core", node); + defaultWorkflow.delete(); + } catch (WorkflowException e) { + Gallery.log.error(e.getMessage()); + } catch (MappingException e) { + Gallery.log.error(e.getMessage()); + } catch (RepositoryException e) { + Gallery.log.error(e.getMessage()); + } + try { + node.getSession().refresh(false); + } catch(RepositoryException e) { + // deliberate ignore + } + } + } } catch (IOException ex) { Gallery.log.info("upload of image truncated"); error((new StringResourceModel("upload-failed-label", this, null).getString())); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog.properties 2010-03-09 16:37:49 UTC (rev 22058) @@ -2,6 +2,7 @@ cancel=Cancel delete-message-extended: Delete exception=An error occurred, please retry. +exception,javax.jcr.ValueFormatException=Invalid content. exception,org.hippoecm.repository.api.WorkflowException=The action failed. exception,org.hippoecm.repository.api.WorkflowException,Cannot\ create\ new\ namespace=Cannot create new namespace exception,org.hippoecm.repository.api.WorkflowException,No\ name\ for\ destination\ given=No name for destination given. Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties 2010-03-09 16:36:30 UTC (rev 22057) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties 2010-03-09 16:37:49 UTC (rev 22058) @@ -2,6 +2,7 @@ cancel=Annuleer delete-message-extended: Verwijder exception=Er heeft een fout plaatsgevonden, probeer opnieuw. +exception,javax.jcr.ValueFormatException=Ongeldige invoer. exception,org.hippoecm.repository.api.WorkflowException=The actie is mislukt. exception,org.hippoecm.repository.api.WorkflowException,Cannot\ create\ new\ namespace=Kan nieuwe namespace niet aanmaken exception,org.hippoecm.repository.api.WorkflowException,No\ name\ for\ destination\ given=Geen nieuwe naam opgegeven. Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 From svn-logs at hippocms.org Tue Mar 9 17:40:38 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 9 17:45:07 2010 Subject: [HippoRepos-dev] [22059] hippo-ecm: HREPTWO-3947: backport Message-ID: <20100309164038.4A83D1C020@svn.vm.castaserver.com> Revision: 22059 Author: bvanhalderen Date: 2010-03-09 17:40:36 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3947: backport Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java 2010-03-09 16:37:49 UTC (rev 22058) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/crumbs/AdminBreadCrumbBar.java 2010-03-09 16:40:36 UTC (rev 22059) @@ -37,7 +37,7 @@ public BreadCrumbComponent(String id, int index, IBreadCrumbModel breadCrumbModel, final IBreadCrumbParticipant participant, boolean enableLink) { super(id); - add(new Label("sep", (index > 0) ? "" : "").setEscapeModelStrings(false).setRenderBodyOnly(true)); + add(new Label("sep", "").setRenderBodyOnly(true)); BreadCrumbLink link = new BreadCrumbLink("link", breadCrumbModel) { private static final long serialVersionUID = 1L; Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java 2010-03-09 16:37:49 UTC (rev 22058) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/src/main/java/org/hippoecm/frontend/plugins/cms/dashboard/EventModel.java 2010-03-09 16:40:36 UTC (rev 22059) @@ -22,6 +22,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.wicket.Component; import org.apache.wicket.model.IComponentAssignedModel; import org.apache.wicket.model.IModel; @@ -43,13 +44,13 @@ private String time; private String method; private String user; - private IModel nameModel; + private IModel nameModel; public EventModel(JcrNodeModel eventNode) { this(eventNode, null); } - public EventModel(JcrNodeModel eventNode, IModel nameModel) { + public EventModel(JcrNodeModel eventNode, IModel nameModel) { Node node = eventNode.getNode(); try { if (node == null || !node.isNodeType("hippolog:item")) { @@ -184,8 +185,10 @@ public Object getObject() { if (nameModel != null) { + String name = nameModel.getObject(); + name = StringEscapeUtils.escapeHtml(name); return new StringResourceModel(time, component, null, "").getString() - + new StringResourceModel(method, component, null, new Object[] { user, nameModel.getObject() }).getString(); + + new StringResourceModel(method, component, null, new Object[] { user, name }).getString(); } else { return new StringResourceModel(time, component, null, "").getString() + new StringResourceModel(method, component, null, new Object[] { user }).getString(); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 From svn-logs at hippocms.org Tue Mar 9 17:41:31 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Tue Mar 9 17:45:58 2010 Subject: [HippoRepos-dev] [22060] hippo-ecm: HREPTWO-3955: backport Message-ID: <20100309164132.004CE1C020@svn.vm.castaserver.com> Revision: 22060 Author: bvanhalderen Date: 2010-03-09 17:41:31 +0100 (Tue, 09 Mar 2010) Log Message: ----------- HREPTWO-3955: backport Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java 2010-03-09 16:40:36 UTC (rev 22059) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java 2010-03-09 16:41:31 UTC (rev 22060) @@ -18,11 +18,13 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.apache.wicket.Response; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.NonCachingImage; import org.apache.wicket.markup.html.link.ResourceLink; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.Model; +import org.apache.wicket.protocol.http.WebResponse; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.standards.util.ByteSizeFormatter; @@ -54,6 +56,12 @@ Fragment fragment = new Fragment("fragment", "unknown", this); try { Node node = getModelObject(); + final String filename; + if(node.getDefinition().getName().equals("*")) { + filename = node.getName(); + } else { + filename = node.getParent().getName(); + } String mimeType = node.getProperty("jcr:mimeType").getString(); if (mimeType.indexOf('/') > 0) { String category = mimeType.substring(0, mimeType.indexOf('/')); @@ -64,7 +72,14 @@ fragment = new Fragment("fragment", "embed", this); fragment.add(new Label("filesize", new Model(formatter.format(resource.length())))); fragment.add(new Label("mimetype", new Model(resource.getContentType()))); - fragment.add(new ResourceLink("link", new JcrResource(resource))); + fragment.add(new ResourceLink("link", new JcrResource(resource) { + @Override + protected void configureResponse(Response response) { + if(response instanceof WebResponse) { + ((WebResponse)response).setHeader("Content-Disposition", "attachment; filename=" + filename); + } + } + })); } } } catch (RepositoryException ex) { Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java 2010-03-09 16:40:36 UTC (rev 22059) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/JcrResourceRequestTarget.java 2010-03-09 16:41:31 UTC (rev 22060) @@ -118,6 +118,10 @@ response.setContentType(mimeType); } + if (!mimeType.toLowerCase().startsWith("image/")) { + response.setHeader("Content-Disposition", "attachment; filename=" + node.getName()); + } + // Make sure it is not cached by a client response.setHeader("Expires", "Mon, 26 Jul 1997 05:00:00 GMT"); response.setHeader("Cache-Control", "no-cache, must-revalidate"); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054,22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 From helpdesk at onehippo.com Tue Mar 9 17:48:48 2010 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Tue Mar 9 17:53:11 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3956) After an update all content faceted navigation filter on primary nodetype does not work anymore Message-ID: <18781965.1528.1268153328701.JavaMail.jira@jira.vm.castaserver.com> After an update all content faceted navigation filter on primary nodetype does not work anymore ----------------------------------------------------------------------------------------------- Key: HREPTWO-3956 URL: http://issues.onehippo.com/browse/HREPTWO-3956 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Ard Schrijvers Assignee: Ard Schrijvers Priority: Top Thus, for example: hippofacnav:filters - jcr:primaryType=demosite:product in the hst demosuite does not work anymore after an update all content -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 9 17:50:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Tue Mar 9 17:55:13 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <7443189.1536.1268153448765.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86160#action_86160 ] Frank van Lankvelt commented on HREPTWO-3651: --------------------------------------------- Actually, I don't see the case for inserting javascript as a src attribute. What are you going to achieve? The example that is given ("Hack works!") does not work in some browsers (ff, chrome). So there will have to be an alternative script to get those browsers to function. I would vote for only allowing scripting from > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Tue Mar 9 19:05:30 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Tue Mar 9 19:05:27 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_became_unstable=3A__Hipp?= =?utf-8?q?o_ECM_Trunk_=C2=BB_YUI_frontend_addon_=231179?= Message-ID: <27525620.291268157930912.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Tue Mar 9 19:05:32 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Tue Mar 9 19:05:30 2010 Subject: [HippoRepos-dev] Hudson build became unstable: Hippo ECM Trunk #1179 Message-ID: <338393.301268157932868.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Wed Mar 10 08:09:48 2010 From: helpdesk at onehippo.com (JIRA (Dennis Dam)) Date: Wed Mar 10 08:14:14 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3512665.1598.1268204988609.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86185#action_86185 ] Dennis Dam commented on HREPTWO-3651: ------------------------------------- I never encountered this usecase either. Jasha seems to know more about it, maybe ask him.. > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Frank van Lankvelt > Priority: Top > Fix For: r2.13.00 > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 08:30:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 10 08:35:16 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3714) Consolidate: Do not index hippo:resource binary property but text property instead In-Reply-To: <30747818.239121265028660359.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <24293762.1620.1268206248525.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3714?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3714: ---------------------------------------- Original Estimate: 2 days Remaining Estimate: 2 days > Consolidate: Do not index hippo:resource binary property but text property instead > ---------------------------------------------------------------------------------- > > Key: HREPTWO-3714 > URL: http://issues.onehippo.com/browse/HREPTWO-3714 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Stephan Westen > Assignee: Berry van Halderen > Priority: Top > Fix For: r2.13.00 > > Original Estimate: 2 days > Remaining Estimate: 2 days > > There are some shortcuts in repository to support this, we need to consolidate. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 08:35:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 10 08:40:17 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3887) Upon editing image/asset document editor does not switch back to preview mode from edit mode. In-Reply-To: <1450427.2620.1267114730378.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3595906.1622.1268206548597.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3887?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3887: ---------------------------------------- Original Estimate: 2 hours Remaining Estimate: 2 hours > Upon editing image/asset document editor does not switch back to preview mode from edit mode. > --------------------------------------------------------------------------------------------- > > Key: HREPTWO-3887 > URL: http://issues.onehippo.com/browse/HREPTWO-3887 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 > (Hippo Repository 2.12.04) > Reporter: Sylvain P?lissier > Assignee: Berry van Halderen > Priority: Low > Fix For: r2.13.00 > > Attachments: missing_done.png > > Original Estimate: 2 hours > Remaining Estimate: 2 hours > > STEPS > ----- > If you open an image (such as Images . Hippo.jpg) and/or an asset (such as Assets > Hippo.pdf), and then press Edit, you will notice that the Done button is missing next to the Save button. As a consequence, it is not possible to put the open document back into 'preview mode', that is the way it looked when it was first open. See attached missing_done. > But closing the document works, and once reopened shows the expected 'preview mode' state. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 08:35:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 10 08:40:19 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3683) Add free text search support In-Reply-To: <18360663.209561264168980364.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <27660299.1624.1268206548636.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3683?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3683: ---------------------------------------- Original Estimate: 2 days Remaining Estimate: 2 days > Add free text search support > ----------------------------- > > Key: HREPTWO-3683 > URL: http://issues.onehippo.com/browse/HREPTWO-3683 > Project: Hippo Repository 2 > Issue Type: Sub-task > Components: repository-core > Reporter: Ard Schrijvers > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Original Estimate: 2 days > Remaining Estimate: 2 days > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 08:35:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 10 08:40:22 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3401) Error while disposing workspace when using SPI In-Reply-To: <923072.165041258643236067.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <25100314.1626.1268206548670.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3401?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3401: ---------------------------------------- Original Estimate: 1 day, 4 hours Remaining Estimate: 1 day, 4 hours > Error while disposing workspace when using SPI > ---------------------------------------------- > > Key: HREPTWO-3401 > URL: http://issues.onehippo.com/browse/HREPTWO-3401 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.10, r2.06.14, r2.09.03 > Reporter: Bart van der Schans > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Original Estimate: 1 day, 4 hours > Remaining Estimate: 1 day, 4 hours > > 19.11.2009 16:14:51 WARN [org.apache.jackrabbit.jcr2spi.WorkspaceManager.dispose():549] Exception while disposing WorkspaceManager: java.lang.ClassCastException: $Proxy15 cannot be cast to java.rmi.server.RemoteObject -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 08:49:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 10 08:54:14 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3924) Fix remaining issues with Pretty URLs In-Reply-To: <6740182.6424.1267699010743.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21935403.1631.1268207388575.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3924?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3924: ---------------------------------------- Original Estimate: 4 hours Remaining Estimate: 4 hours Estimate based on at this time known change requests. > Fix remaining issues with Pretty URLs > ------------------------------------- > > Key: HREPTWO-3924 > URL: http://issues.onehippo.com/browse/HREPTWO-3924 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Original Estimate: 4 hours > Remaining Estimate: 4 hours > > - the set of characters that is allowed differs between implementation and (intended) specification > - consider converting to lower case -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 08:49:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 10 08:54:18 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3849) integration test UpgradeIntegrationTest also run during test phase In-Reply-To: <15134251.309.1266926810402.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <25078222.1632.1268207388595.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3849?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3849: ---------------------------------------- Original Estimate: 3 hours Remaining Estimate: 3 hours > integration test UpgradeIntegrationTest also run during test phase > ------------------------------------------------------------------ > > Key: HREPTWO-3849 > URL: http://issues.onehippo.com/browse/HREPTWO-3849 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Reporter: Berry van Halderen > Assignee: Berry van Halderen > Priority: Trivial > Fix For: r2.13.00 > > Original Estimate: 3 hours > Remaining Estimate: 3 hours > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 09:05:52 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 10 09:10:21 2010 Subject: [HippoRepos-dev] [22062] hippo-ecm/trunk: HREPTWO-16: some comments on api calls and align repository.xml with others Message-ID: <20100310080552.10E091C021@svn.vm.castaserver.com> Revision: 22062 Author: bvanhalderen Date: 2010-03-10 09:05:51 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-16: some comments on api calls and align repository.xml with others Modified Paths: -------------- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/repository.xml hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java Modified: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java =================================================================== --- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java 2010-03-09 17:13:52 UTC (rev 22061) +++ hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java 2010-03-10 08:05:51 UTC (rev 22062) @@ -27,7 +27,6 @@ import javax.jcr.PropertyIterator; import javax.jcr.RepositoryException; import javax.jcr.Session; -import javax.jcr.nodetype.NodeType; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; import javax.jcr.InvalidItemStateException; @@ -37,7 +36,6 @@ /** * - * @author berry */ public abstract class UpdaterItemVisitor implements ItemVisitor { @SuppressWarnings("unused") @@ -121,7 +119,7 @@ } if(node instanceof HippoNode) { Node canonical = ((HippoNode) node).getCanonicalNode(); - if(canonical == null || canonical.isSame(node)) { + if(canonical == null || !canonical.isSame(node)) { return; } } @@ -260,13 +258,29 @@ * @throws javax.jcr.RepositoryException */ public abstract NodeIterator iterator(Session session) throws RepositoryException; + + /** + * THIS METHOD WAS NEVER PART OF THE API, NO NOT USE UNLESS TRUELY NECESSARY AND REPORT AN ISSUE WITH YOUR USE CASE. + * + * @return the same instance on which this method was invoked + * @deprecated + */ + @Deprecated public final Iterated setAtomic() { isAtomic = true; return this; } + + /** + * THIS METHOD WAS NEVER PART OF THE API, NO NOT USE UNLESS TRUELY NECESSARY AND REPORT AN ISSUE WITH YOUR USE CASE. + * @return whether the #setAtomic method has been called on this visitor + */ public final boolean isAtomic() { return isAtomic; } + /** + * {@inheritDoc} + */ @Override public final void visit(Node node, int level, boolean leaving) throws RepositoryException { if(leaving) @@ -274,10 +288,16 @@ else entering(node, level); } + /** + * {@inheritDoc} + */ @Override protected final void entering(Node node, int level) throws RepositoryException { } + /** + * {@inheritDoc} + */ @Override protected final void entering(Property property, int level) throws RepositoryException { Modified: hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/repository.xml =================================================================== --- hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/repository.xml 2010-03-09 17:13:52 UTC (rev 22061) +++ hippo-ecm/trunk/repository/application/src/main/resources/org/hippoecm/repository/repository.xml 2010-03-10 08:05:51 UTC (rev 22062) @@ -122,8 +122,8 @@ - - + + Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java 2010-03-09 17:13:52 UTC (rev 22061) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java 2010-03-10 08:05:51 UTC (rev 22062) @@ -820,8 +820,9 @@ log.info("migration update traverse iterated for module " + module.name + " (" + visitor.toString() + ")"); while (nodeIter.hasNext()) { Node node = nodeIter.nextNode(); + String path = ""; try { - String path = node.getPath(); + path = node.getPath(); node = updaterSession.getRootNode(); if (!path.equals("/")) { node = node.getNode(path.substring(1)); @@ -982,6 +983,7 @@ if (node.getPath().equals("/jcr:system")) { return; } + node.getPath(); if (node instanceof HippoNode) { Node canonical = ((HippoNode)node).getCanonicalNode(); if (canonical == null || !canonical.isSame(node)) { From svn-logs at hippocms.org Wed Mar 10 09:11:05 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 10 09:15:33 2010 Subject: [HippoRepos-dev] [22063] hippo-ecm: HREPTWO-16: some comments on api calls and align repository.xml with others Message-ID: <20100310081105.C08FC1C021@svn.vm.castaserver.com> Revision: 22063 Author: bvanhalderen Date: 2010-03-10 09:11:04 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-16: some comments on api calls and align repository.xml with others Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/src/main/resources/org/hippoecm/repository/repository.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java 2010-03-10 08:05:51 UTC (rev 22062) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/ext/UpdaterItemVisitor.java 2010-03-10 08:11:04 UTC (rev 22063) @@ -27,7 +27,6 @@ import javax.jcr.PropertyIterator; import javax.jcr.RepositoryException; import javax.jcr.Session; -import javax.jcr.nodetype.NodeType; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; import javax.jcr.InvalidItemStateException; @@ -37,7 +36,6 @@ /** * - * @author berry */ public abstract class UpdaterItemVisitor implements ItemVisitor { @SuppressWarnings("unused") @@ -121,7 +119,7 @@ } if(node instanceof HippoNode) { Node canonical = ((HippoNode) node).getCanonicalNode(); - if(canonical == null || canonical.isSame(node)) { + if(canonical == null || !canonical.isSame(node)) { return; } } @@ -260,13 +258,29 @@ * @throws javax.jcr.RepositoryException */ public abstract NodeIterator iterator(Session session) throws RepositoryException; + + /** + * THIS METHOD WAS NEVER PART OF THE API, NO NOT USE UNLESS TRUELY NECESSARY AND REPORT AN ISSUE WITH YOUR USE CASE. + * + * @return the same instance on which this method was invoked + * @deprecated + */ + @Deprecated public final Iterated setAtomic() { isAtomic = true; return this; } + + /** + * THIS METHOD WAS NEVER PART OF THE API, NO NOT USE UNLESS TRUELY NECESSARY AND REPORT AN ISSUE WITH YOUR USE CASE. + * @return whether the #setAtomic method has been called on this visitor + */ public final boolean isAtomic() { return isAtomic; } + /** + * {@inheritDoc} + */ @Override public final void visit(Node node, int level, boolean leaving) throws RepositoryException { if(leaving) @@ -274,10 +288,16 @@ else entering(node, level); } + /** + * {@inheritDoc} + */ @Override protected final void entering(Node node, int level) throws RepositoryException { } + /** + * {@inheritDoc} + */ @Override protected final void entering(Property property, int level) throws RepositoryException { Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/src/main/resources/org/hippoecm/repository/repository.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/src/main/resources/org/hippoecm/repository/repository.xml 2010-03-10 08:05:51 UTC (rev 22062) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/src/main/resources/org/hippoecm/repository/repository.xml 2010-03-10 08:11:04 UTC (rev 22063) @@ -122,8 +122,8 @@ - - + + Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java 2010-03-10 08:05:51 UTC (rev 22062) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/updater/UpdaterEngine.java 2010-03-10 08:11:04 UTC (rev 22063) @@ -820,8 +820,9 @@ log.info("migration update traverse iterated for module " + module.name + " (" + visitor.toString() + ")"); while (nodeIter.hasNext()) { Node node = nodeIter.nextNode(); + String path = ""; try { - String path = node.getPath(); + path = node.getPath(); node = updaterSession.getRootNode(); if (!path.equals("/")) { node = node.getNode(path.substring(1)); Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 From helpdesk at onehippo.com Wed Mar 10 09:33:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 10 09:38:13 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30162022.1666.1268210028667.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3651: ------------------------------------ Fix Version/s: r2.12.07 > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Frank van Lankvelt > Priority: Top > Fix For: r2.12.07, r2.13.00 > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Wed Mar 10 10:22:07 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 10:22:08 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_still_unstable=3A_Hip?= =?utf-8?q?po_ECM_Trunk_=C2=BB_YUI_frontend_addon_=231180?= In-Reply-To: <27525620.291268157930912.JavaMail.hudson@hudson.onehippo.org> References: <27525620.291268157930912.JavaMail.hudson@hudson.onehippo.org> Message-ID: <6140521.311268212927651.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Wed Mar 10 10:22:10 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 10:22:12 2010 Subject: [HippoRepos-dev] Hudson build is still unstable: Hippo ECM Trunk #1180 In-Reply-To: <338393.301268157932868.JavaMail.hudson@hudson.onehippo.org> References: <338393.301268157932868.JavaMail.hudson@hudson.onehippo.org> Message-ID: <25491827.321268212930718.JavaMail.hudson@hudson.onehippo.org> See From svn-logs at hippocms.org Wed Mar 10 10:38:10 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 10 10:42:37 2010 Subject: [HippoRepos-dev] [22067] hippo-ecm: HREPTWO-3953: fix tests Message-ID: <20100310093810.9C8D81C020@svn.vm.castaserver.com> Revision: 22067 Author: fvlankvelt Date: 2010-03-10 10:38:10 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3953: fix tests YuiIds without elements backing them are translated to null by the yuiidprocessor. Modified Paths: -------------- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java Modified: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-10 08:57:50 UTC (rev 22066) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-10 09:38:10 UTC (rev 22067) @@ -136,7 +136,7 @@ JsonConfig jsonConfig = new JsonConfig(); jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); - assertTrue("".equals(wfObject.get("rootId"))); + assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); JSONArray units = wfObject.getJSONArray("units"); Map unitMap = new TreeMap(); @@ -169,7 +169,7 @@ JsonConfig jsonConfig = new JsonConfig(); jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); - assertTrue("".equals(wfObject.get("rootId"))); + assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); JSONArray units = wfObject.getJSONArray("units"); JSONObject centerObject = null; From helpdesk at onehippo.com Wed Mar 10 10:39:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Wed Mar 10 10:44:13 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3957) Remove hippo:translated mixin from defaultread as it too broad Message-ID: <16397734.1728.1268213988678.JavaMail.jira@jira.vm.castaserver.com> Remove hippo:translated mixin from defaultread as it too broad -------------------------------------------------------------- Key: HREPTWO-3957 URL: http://issues.onehippo.com/browse/HREPTWO-3957 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06, r2.09.07, r2.06.17, r2.03.11 Reporter: Bart van der Schans Assignee: Bart van der Schans Fix For: r2.03.12, r2.06.18, r2.12.07, r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 10:39:55 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 10:44:22 2010 Subject: [HippoRepos-dev] [22068] hippo-ecm: HREPTWO-3957: Remove traslated mixin rule Message-ID: <20100310093955.2E7861C020@svn.vm.castaserver.com> Revision: 22068 Author: bvdschans Date: 2010-03-10 10:39:54 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3957: Remove traslated mixin rule Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:38:10 UTC (rev 22067) +++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:39:54 UTC (rev 22068) @@ -790,28 +790,6 @@ - - - hippo:domainrule - - - - hippo:facetrule - - - jcr:mixinTypes - - - Name - - - hippo:translated - - - true - - - hippo:domainrule From svn-logs at hippocms.org Wed Mar 10 10:40:26 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 10:44:53 2010 Subject: [HippoRepos-dev] [22069] hippo-ecm: HREPTWO-3957: Remove traslated mixin rule Message-ID: <20100310094026.516041C020@svn.vm.castaserver.com> Revision: 22069 Author: bvdschans Date: 2010-03-10 10:40:25 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3957: Remove traslated mixin rule Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:39:54 UTC (rev 22068) +++ hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:40:25 UTC (rev 22069) @@ -291,28 +291,6 @@ - - - hippo:domainrule - - - - hippo:facetrule - - - jcr:mixinTypes - - - Name - - - hippo:translated - - - true - - - hippo:domainrule From svn-logs at hippocms.org Wed Mar 10 10:40:40 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 10:45:07 2010 Subject: [HippoRepos-dev] [22070] hippo-ecm: HREPTWO-3957: Remove traslated mixin rule Message-ID: <20100310094040.B387E1C020@svn.vm.castaserver.com> Revision: 22070 Author: bvdschans Date: 2010-03-10 10:40:39 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3957: Remove traslated mixin rule Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:40:25 UTC (rev 22069) +++ hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:40:39 UTC (rev 22070) @@ -321,31 +321,6 @@ - - - hipposys:domainrule - - - - hipposys:facetrule - - - true - - - jcr:mixinTypes - - - false - - - Name - - - hippo:translated - - - hipposys:domainrule From svn-logs at hippocms.org Wed Mar 10 10:40:44 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 10 10:45:15 2010 Subject: [HippoRepos-dev] [22071] hippo-ecm: HREPTWO-3651: upgrade to latest htmlcleaner Message-ID: <20100310094044.91CFA1C021@svn.vm.castaserver.com> Revision: 22071 Author: fvlankvelt Date: 2010-03-10 10:40:44 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3651: upgrade to latest htmlcleaner it filters out the javascript: attribute value Modified Paths: -------------- hippo-ecm/trunk/addon/xinha-frontend/pom.xml Modified: hippo-ecm/trunk/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/pom.xml 2010-03-10 09:40:39 UTC (rev 22070) +++ hippo-ecm/trunk/addon/xinha-frontend/pom.xml 2010-03-10 09:40:44 UTC (rev 22071) @@ -62,7 +62,7 @@ hippo htmlcleaner - 1.01.06 + 1.01.07 xml-apis From svn-logs at hippocms.org Wed Mar 10 10:42:12 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 10:46:39 2010 Subject: [HippoRepos-dev] [22072] hippo-ecm: HREPTWO-3957: Remove traslated mixin rule Message-ID: <20100310094212.0C13E1C020@svn.vm.castaserver.com> Revision: 22072 Author: bvdschans Date: 2010-03-10 10:42:11 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3957: Remove traslated mixin rule Modified Paths: -------------- hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:40:44 UTC (rev 22071) +++ hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:42:11 UTC (rev 22072) @@ -318,31 +318,6 @@ - - - hipposys:domainrule - - - - hipposys:facetrule - - - true - - - jcr:mixinTypes - - - false - - - Name - - - hippo:translated - - - hipposys:domainrule From svn-logs at hippocms.org Wed Mar 10 10:44:01 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 10:48:28 2010 Subject: [HippoRepos-dev] [22073] hippo-ecm: HREPTWO-3957: Remove traslated mixin rule Message-ID: <20100310094401.4AA1A1C020@svn.vm.castaserver.com> Revision: 22073 Author: bvdschans Date: 2010-03-10 10:44:00 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3957: Remove traslated mixin rule Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:42:11 UTC (rev 22072) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-10 09:44:00 UTC (rev 22073) @@ -293,56 +293,6 @@ - - - hipposys:domainrule - - - - hipposys:facetrule - - - true - - - jcr:primaryType - - - false - - - Name - - - hippo:translation - - - - - - hipposys:domainrule - - - - hipposys:facetrule - - - true - - - jcr:mixinTypes - - - false - - - Name - - - hippo:translated - - - hipposys:domainrule From svn-logs at hippocms.org Wed Mar 10 10:57:15 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 10 11:01:45 2010 Subject: [HippoRepos-dev] [22074] hippo-ecm: HREPTWO-3651: upgrade to htmlcleaner 1.01.07 Message-ID: <20100310095715.324751C020@svn.vm.castaserver.com> Revision: 22074 Author: fvlankvelt Date: 2010-03-10 10:57:14 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3651: upgrade to htmlcleaner 1.01.07 It filters out the javascript: attribute value. Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 /hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 /hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 /hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 /hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 /hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-10 09:44:00 UTC (rev 22073) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-10 09:57:14 UTC (rev 22074) @@ -62,7 +62,7 @@ hippo htmlcleaner - 1.01.06 + 1.01.07 xml-apis Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 /hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 /hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 /hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 /hippo-ecm/trunk/frontend/test/pom.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 /hippo-ecm/trunk/frontend/test/src/test:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 /hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 /hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 /hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 /hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 /hippo-ecm/trunk/src/site/CMS_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/integration_testing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 /hippo-ecm/trunk/src/site/apt/releasing:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 /hippo-ecm/trunk/src/site/hippo_logo.png:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 /hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 From helpdesk at onehippo.com Wed Mar 10 10:58:49 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 10 11:03:15 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3922) Serializable sessions in tomcat In-Reply-To: <22697149.6108.1267629350365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <14664063.1761.1268215129370.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3922?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3922: ---------------------------------------- Fix Version/s: Backlog (was: r2.13.00) > Serializable sessions in tomcat > ------------------------------- > > Key: HREPTWO-3922 > URL: http://issues.onehippo.com/browse/HREPTWO-3922 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (Tue, 02 Mar 2010) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: Backlog > > Attachments: persistent_session.log, tomcat_manager.png, tomcat_serialized_session_log, tomcat_serialized_session_logindlg.png > > > When tomcat shuts down, by default it will serialize sessions to disk and deserialize them when it is restarted. This can be disabled, as has been documented, but it would be better if this simply wasn't necessary. > ====== Original problem ===== > There is a problem when the CMS is deployed in Tomcat 6.0.24. The consequence is that, after restarting the server, it might not be possible to log again in to Hippo CMS (see attached login dialog tomcat_serialized_session_logindlg.png), or the login might work but the CMS is empty except for the users and groups. > The error output is attached as tomcat_serialized_session.log where the steps are marked like: > ----- > STEPS > ----- > So, in summary: > 1/ SERVER STARTS > 2/ 'admin' logs in, goes to the Documents, logs out > 3/ SERVER STOPS > 4/ SERVER STARTS (2) > 5/ The browser is refreshed > 6/ SERVER STOPS (2) > There is a workaround: > 1/ access http:// and log in to Tomcat Manager (http:///manager/html) > 2/ zero the idle threshold for the Hippo CMS application > 3/ click the Expire sessions button > See tomcat_manager.png for an illustration. > This should let the user continue normally. The problem occurs only after restarting Tomcat 6.0.xx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 11:02:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 10 11:07:14 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-2747) No save feedback message in template builder (inconsistent with template editor) In-Reply-To: <2866508.1245198351393.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <4609634.1764.1268215368545.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-2747?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-2747: ---------------------------------------- Fix Version/s: Backlog (was: r2.13.00) > No save feedback message in template builder (inconsistent with template editor) > -------------------------------------------------------------------------------- > > Key: HREPTWO-2747 > URL: http://issues.onehippo.com/browse/HREPTWO-2747 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.06.05 (m13 - rc6) > Environment: tag 2.06.05 > Reporter: Niels van Kampenhout > Assignee: Frank van Lankvelt > Priority: Low > Fix For: Backlog > > Attachments: document_saved_missed_in_configuration_editor.jpg > > Original Estimate: 2 hours > Remaining Estimate: 2 hours > > When editing a document and clicking Save, a feedback message "Document saved on...." fades in, stays for a few seconds, and fades away again. Very nice!!!! Very reassuring for the user. > When editing a document type (template) however, no message is displayed after clicking Save, the user has to guess if it has been successful. > The document editor and document type editor should be consistent in GUI functionality and look and feel. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 11:40:04 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 11:44:32 2010 Subject: [HippoRepos-dev] [22075] hippo-ecm: HREPTWO-16: Skip regulary random failing test Message-ID: <20100310104004.F27F71C020@svn.vm.castaserver.com> Revision: 22075 Author: bvdschans Date: 2010-03-10 11:40:04 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-16: Skip regulary random failing test Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml 2010-03-10 09:57:14 UTC (rev 22074) +++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml 2010-03-10 10:40:04 UTC (rev 22075) @@ -42,6 +42,16 @@ - + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/VersioningWorkflowTest.java + + + + From svn-logs at hippocms.org Wed Mar 10 11:43:40 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 11:48:08 2010 Subject: [HippoRepos-dev] [22076] hippo-ecm: HREPTWO-16: Move skip test to correct pom Message-ID: <20100310104340.DD5011C020@svn.vm.castaserver.com> Revision: 22076 Author: bvdschans Date: 2010-03-10 11:43:40 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-16: Move skip test to correct pom Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/test/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml 2010-03-10 10:40:04 UTC (rev 22075) +++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/pom.xml 2010-03-10 10:43:40 UTC (rev 22076) @@ -41,17 +41,4 @@ test - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/VersioningWorkflowTest.java - - - - - Modified: hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/test/pom.xml 2010-03-10 10:40:04 UTC (rev 22075) +++ hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/test/pom.xml 2010-03-10 10:43:40 UTC (rev 22076) @@ -130,6 +130,9 @@ ${history.points} + + **/VersioningWorkflowTest.java + From helpdesk at onehippo.com Wed Mar 10 11:48:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 10 11:53:16 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3958) Create "compare" framework in template engine Message-ID: <30611242.1822.1268218128752.JavaMail.jira@jira.vm.castaserver.com> Create "compare" framework in template engine --------------------------------------------- Key: HREPTWO-3958 URL: http://issues.onehippo.com/browse/HREPTWO-3958 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Frank van Lankvelt Assignee: Frank van Lankvelt Fix For: r2.13.00 The template engine should offer a new mode "compare". It receives two models in this mode, that will be shown side-by-side / intermingled. Templates can offer this mode by doing the same on a lower level; they should accept two models in this mode. They can publish this capability by offering a model.secondary reference. Backwards compatility should be offered by instantiating templates for fields twice and showing the two instances under the same caption. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 11:50:57 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 10 11:55:28 2010 Subject: [HippoRepos-dev] [22077] hippo-ecm: HREPTWO-16: fix dependency Message-ID: <20100310105057.CB6B61C021@svn.vm.castaserver.com> Revision: 22077 Author: bvanhalderen Date: 2010-03-10 11:50:57 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-16: fix dependency Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-10 10:43:40 UTC (rev 22076) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-10 10:50:57 UTC (rev 22077) @@ -74,7 +74,7 @@ org.hippoecm hippo-ecm-addon-gallery-frontend - 2.13.00-SNAPSHOT + 2.12.07-SNAPSHOT From schans at onehippo.com Wed Mar 10 12:44:19 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 12:44:18 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_stable_=3A_Hi?= =?utf-8?q?ppo_ECM_Trunk_=C2=BB_YUI_frontend_addon_=231181?= In-Reply-To: <6140521.311268212927651.JavaMail.hudson@hudson.onehippo.org> References: <6140521.311268212927651.JavaMail.hudson@hudson.onehippo.org> Message-ID: <2838963.331268221459519.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Wed Mar 10 12:44:21 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 12:44:22 2010 Subject: [HippoRepos-dev] Hudson build is back to stable : Hippo ECM Trunk #1181 In-Reply-To: <25491827.321268212930718.JavaMail.hudson@hudson.onehippo.org> References: <25491827.321268212930718.JavaMail.hudson@hudson.onehippo.org> Message-ID: <28824497.341268221461724.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Wed Mar 10 13:47:48 2010 From: helpdesk at onehippo.com (JIRA (Ard Schrijvers)) Date: Wed Mar 10 13:52:14 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3959) Fix and enable the Authorization Query in faceted environment Message-ID: <29765218.1907.1268225268714.JavaMail.jira@jira.vm.castaserver.com> Fix and enable the Authorization Query in faceted environment -------------------------------------------------------------- Key: HREPTWO-3959 URL: http://issues.onehippo.com/browse/HREPTWO-3959 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Ard Schrijvers Assignee: Ard Schrijvers -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 13:55:36 2010 From: svn-logs at hippocms.org (aschrijvers) Date: Wed Mar 10 14:00:03 2010 Subject: [HippoRepos-dev] [22078] hippo-ecm: HREPTWO-3923 faceted navigation also available for editors / author etc Message-ID: <20100310125536.124301C021@svn.vm.castaserver.com> Revision: 22078 Author: aschrijvers Date: 2010-03-10 13:55:35 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3923 faceted navigation also available for editors / author etc 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 2010-03-10 10:50:57 UTC (rev 22077) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java 2010-03-10 12:55:35 UTC (rev 22078) @@ -238,7 +238,8 @@ // TODO perhaps create cached user specific filter for authorisation to gain speed if (contextImpl.authorizationQuery.getQuery().clauses().size() > 0) { - searchQuery.add(contextImpl.authorizationQuery.getQuery(), Occur.MUST); + // TODO enable again after HREPTWO-3959 is fixed + //searchQuery.add(contextImpl.authorizationQuery.getQuery(), Occur.MUST); } if (initialLuceneQuery != null) { From svn-logs at hippocms.org Wed Mar 10 14:04:36 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 10 14:09:03 2010 Subject: [HippoRepos-dev] [22079] hippo-ecm/releases/Release-HREPTWO-v7.3/: HREPTWO-3960: mark release officially in SVN Message-ID: <20100310130436.D72481C020@svn.vm.castaserver.com> Revision: 22079 Author: bvanhalderen Date: 2010-03-10 14:04:36 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3960: mark release officially in SVN Added Paths: ----------- hippo-ecm/releases/Release-HREPTWO-v7.3/ Property changes on: hippo-ecm/releases/Release-HREPTWO-v7.3 ___________________________________________________________________ Added: svn:ignore + *.tmp .classpath .project .settings local.properties nbproject target jpox.log Added: svn:mergeinfo + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 From helpdesk at onehippo.com Wed Mar 10 14:05:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Wed Mar 10 14:10:16 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3960) Release 7.3 Message-ID: <26792814.1928.1268226348431.JavaMail.jira@jira.vm.castaserver.com> Release 7.3 ----------- Key: HREPTWO-3960 URL: http://issues.onehippo.com/browse/HREPTWO-3960 Project: Hippo Repository 2 Issue Type: Task Affects Versions: r2.12.06 Reporter: Berry van Halderen Assignee: Berry van Halderen Fix For: r2.12.06 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 14:06:38 2010 From: svn-logs at hippocms.org (aschrijvers) Date: Wed Mar 10 14:11:05 2010 Subject: [HippoRepos-dev] [22080] hippo-ecm: HREPTWO-3923 faceted navigation also available for editors / author etc Message-ID: <20100310130638.516551C021@svn.vm.castaserver.com> Revision: 22080 Author: aschrijvers Date: 2010-03-10 14:06:37 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3923 faceted navigation also available for editors / author etc Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java 2010-03-10 13:04:36 UTC (rev 22079) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/FacetedNavigationEngineThirdImpl.java 2010-03-10 13:06:37 UTC (rev 22080) @@ -238,7 +238,8 @@ // TODO perhaps create cached user specific filter for authorisation to gain speed if (contextImpl.authorizationQuery.getQuery().clauses().size() > 0) { - searchQuery.add(contextImpl.authorizationQuery.getQuery(), Occur.MUST); + // TODO enable again after HREPTWO-3959 is fixed + // searchQuery.add(contextImpl.authorizationQuery.getQuery(), Occur.MUST); } if (initialLuceneQuery != null) { From svn-logs at hippocms.org Wed Mar 10 14:16:42 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 10 14:21:09 2010 Subject: [HippoRepos-dev] [22081] hippo-ecm/releases: HREPTWO-3960; wrong name pattern Message-ID: <20100310131642.9F8581C020@svn.vm.castaserver.com> Revision: 22081 Author: bvanhalderen Date: 2010-03-10 14:16:42 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3960; wrong name pattern Added Paths: ----------- hippo-ecm/releases/Release-HREPTWO-v7_3/ Removed Paths: ------------- hippo-ecm/releases/Release-HREPTWO-v7.3/ Property changes on: hippo-ecm/releases/Release-HREPTWO-v7_3 ___________________________________________________________________ Added: svn:ignore + *.tmp .classpath .project .settings local.properties nbproject target jpox.log Added: svn:mergeinfo + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007 From svn-logs at hippocms.org Wed Mar 10 14:18:40 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Wed Mar 10 14:23:09 2010 Subject: [HippoRepos-dev] [22082] hippo-ecm/releases/Release-HREPTWO-v7_3: HREPTWO-3960: fix scm headers Message-ID: <20100310131840.DCFEF1C020@svn.vm.castaserver.com> Revision: 22082 Author: bvanhalderen Date: 2010-03-10 14:18:39 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3960: fix scm headers Modified Paths: -------------- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/common/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/test/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/admin/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/browse/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/dashboard/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/edit/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/root/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/eavesdrop/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/common/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/test/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/common/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gotolink/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/common/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/test/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/common/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/test/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/versioning/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/workflow/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha-frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/addon/yui/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/api/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/addon/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/application/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/engine/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/plugins/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/test/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/auth/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/config/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/ear/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/layout/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/skin/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/test/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/package/war/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/bin/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/ear/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/war/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/application/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/connector/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/engine/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/jca/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/modules/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/test/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/upgrade/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/repository/utilities/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/tools/development-content/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/tools/documentation/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/tools/eclipse/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/tools/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/tools/projectexport/pom.xml hippo-ecm/releases/Release-HREPTWO-v7_3/tools/testutils/pom.xml Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/common/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/common/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/common/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/common Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/test/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/test/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/builtin/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/builtin/test Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/admin/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/admin/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/admin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/admin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/admin + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/admin Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/browse/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/browse/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/browse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/browse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/browse + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/browse Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/dashboard/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/dashboard/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/dashboard + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/dashboard + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/dashboard + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/dashboard Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/edit/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/edit/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/edit + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/edit + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/edit + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/edit Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/root/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/root/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/cms/root + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/root + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/root + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/cms/root Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/defaultcontent/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/defaultcontent/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/eavesdrop/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/eavesdrop/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/eavesdrop + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/eavesdrop + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/eavesdrop + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/eavesdrop Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/common/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/common/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/common/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/common Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/test/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/test/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/editor/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/editor/test Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/faceteddate/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/faceteddate/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/common/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/common/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/common/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/common Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gallery/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gallery/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gotolink/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gotolink/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -27,9 +27,9 @@ hippo-ecm-addon-gotolink - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/gotolink + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gotolink + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gotolink + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/gotolink Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -53,9 +53,9 @@ - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/ldap/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/ldap/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reporting/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reporting/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/common/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/common/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/common/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/common Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/test/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/test/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/reviewed-action/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/reviewed-action/test Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/common/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/common/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/common/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/common Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/test/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/test/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/sample/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/sample/test Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/search + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/search Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/standards + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/standards Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/versioning/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/versioning/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/versioning/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -27,9 +27,9 @@ hippo-ecm-addon-versioning - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/versioning + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/versioning + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/versioning + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/versioning Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/workflow/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/workflow/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/workflow/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/workflow + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/workflow + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/workflow + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/workflow Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha-frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha-frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/xinha-frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha-frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha-frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/xinha-frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/addon/yui/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/addon/yui/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/addon/yui/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/addon/yui + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/yui + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/yui + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/addon/yui Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/api/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/api/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/api/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -27,9 +27,9 @@ hippo-ecm-api - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/api + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/api + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/api + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/api Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/addon/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/addon/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/addon/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ maven-archetype - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/addon Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/archetypes + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/archetypes Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/application/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/application/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/application/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/application Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/engine/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/engine/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/engine/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/engine Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/plugins/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/plugins/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/plugins + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/plugins + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/plugins + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/plugins Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/test/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/test/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/test/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/frontend/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/frontend/test Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/auth/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/auth/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/auth/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/auth + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/auth + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/auth + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/auth Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/config/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/config/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/config/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/config + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/config + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/config + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/config Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/ear/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/ear/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/ear/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/ear Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/layout/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/layout/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/layout/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/layout + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/layout + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/layout + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/layout Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package + https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/skin/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/skin/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/skin/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/skin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/skin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/skin + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/skin Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/test/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/test/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/test/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/test Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/package/war/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/package/war/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/package/war/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/package/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/package/war Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -92,9 +92,9 @@ This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html --> - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/bin/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/bin/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/bin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/bin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/bin + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/bin Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/ear/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/ear/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/ear/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/ear Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart + https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/war/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/war/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/war/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/quickstart/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/quickstart/war Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/application/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/application/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/application/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/application Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/connector/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/connector/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/connector/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/connector + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/connector + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/connector + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/connector Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/engine/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/engine/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/engine/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/engine Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/jca/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/jca/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/jca/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -27,9 +27,9 @@ hippo-ecm-repository-jca rar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/jca + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/jca + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/jca + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/jca package Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/modules/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/modules/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/modules/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/modules + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/modules + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/modules + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/modules Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/test/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/test/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/test/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/test Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/upgrade/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/upgrade/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3 Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/repository/utilities/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/repository/utilities/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/repository/utilities/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/repository/utilities + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/utilities + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/utilities + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/repository/utilities Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/tools/development-content/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/tools/development-content/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/tools/development-content/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/development-content + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/development-content + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/development-content + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/development-content Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/tools/documentation/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/tools/documentation/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/tools/documentation/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/documentation + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/documentation + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/documentation + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/documentation Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/tools/eclipse/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/tools/eclipse/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/tools/eclipse/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -36,9 +36,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/eclipse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/eclipse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/eclipse + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/eclipse Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/tools/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/tools/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/tools/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/tools/projectexport/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/tools/projectexport/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/projectexport + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/projectexport + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/projectexport + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/projectexport Modified: hippo-ecm/releases/Release-HREPTWO-v7_3/tools/testutils/pom.xml =================================================================== --- hippo-ecm/releases/Release-HREPTWO-v7_3/tools/testutils/pom.xml 2010-03-10 13:16:42 UTC (rev 22081) +++ hippo-ecm/releases/Release-HREPTWO-v7_3/tools/testutils/pom.xml 2010-03-10 13:18:39 UTC (rev 22082) @@ -29,9 +29,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06/tools/testutils + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/testutils + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/testutils + http://svn.onehippo.org/repos/hippo/hippo-ecm/releases/Release-HREPTWO-v7_3/tools/testutils From helpdesk at onehippo.com Wed Mar 10 14:37:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 10 14:42:13 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3961) Implement diff view for rich text fields Message-ID: <31498247.1957.1268228268497.JavaMail.jira@jira.vm.castaserver.com> Implement diff view for rich text fields ---------------------------------------- Key: HREPTWO-3961 URL: http://issues.onehippo.com/browse/HREPTWO-3961 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Frank van Lankvelt -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Wed Mar 10 15:13:43 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 15:13:42 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_stable_=3A_Hi?= =?utf-8?q?ppo_ECM_GA_7=2E0_=C2=BB_Reviewed_action_addon_tests_=2372?= In-Reply-To: <12581365.41267053934854.JavaMail.hudson@hudson.onehippo.org> References: <12581365.41267053934854.JavaMail.hudson@hudson.onehippo.org> Message-ID: <25281912.351268230423875.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Wed Mar 10 15:13:44 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 15:13:44 2010 Subject: [HippoRepos-dev] Hudson build is back to stable : Hippo ECM GA 7.0 #72 In-Reply-To: <10941128.61267053935841.JavaMail.hudson@hudson.onehippo.org> References: <10941128.61267053935841.JavaMail.hudson@hudson.onehippo.org> Message-ID: <15119192.361268230424861.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Wed Mar 10 17:06:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 10 17:11:15 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3962) Remove support for hipposysedit:name property for field description nodes Message-ID: <22532837.2205.1268237208801.JavaMail.jira@jira.vm.castaserver.com> Remove support for hipposysedit:name property for field description nodes ------------------------------------------------------------------------- Key: HREPTWO-3962 URL: http://issues.onehippo.com/browse/HREPTWO-3962 Project: Hippo Repository 2 Issue Type: Task Reporter: Frank van Lankvelt Assignee: Frank van Lankvelt Fix For: r2.13.00 The hipposysedit field description has changed to use it's node name instead of a :name property to store the name of the field. The 7.3 release ships with an upgrade module that upgrades old templates to the new format. Any project started that has been started with 7.3 uses the new format. This task should complete the transition. There should be an upgrade module that enforces the new format. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:10:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:15:17 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3963) Attached image file that cannot be added to 'Images' Message-ID: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Attached image file that cannot be added to 'Images' ---------------------------------------------------- Key: HREPTWO-3963 URL: http://issues.onehippo.com/browse/HREPTWO-3963 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Environment: IE and Ffx Reporter: Sylvain P?lissier Attachments: cashel_hippo.jpg While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:10:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 10 17:15:20 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3964) Create workflow for unpublished to compare to published Message-ID: <3218784.2218.1268237448676.JavaMail.jira@jira.vm.castaserver.com> Create workflow for unpublished to compare to published ------------------------------------------------------- Key: HREPTWO-3964 URL: http://issues.onehippo.com/browse/HREPTWO-3964 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Frank van Lankvelt -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:12:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 10 17:17:14 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3965) Create workflow for revision to compare to unpublished Message-ID: <20834015.2220.1268237568533.JavaMail.jira@jira.vm.castaserver.com> Create workflow for revision to compare to unpublished ------------------------------------------------------ Key: HREPTWO-3965 URL: http://issues.onehippo.com/browse/HREPTWO-3965 Project: Hippo Repository 2 Issue Type: Sub-task Reporter: Frank van Lankvelt -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:31:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Wed Mar 10 17:36:14 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3966) Make build compatible with maven 3.0 Message-ID: <7902146.2258.1268238708576.JavaMail.jira@jira.vm.castaserver.com> Make build compatible with maven 3.0 ------------------------------------ Key: HREPTWO-3966 URL: http://issues.onehippo.com/browse/HREPTWO-3966 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Bart van der Schans Assignee: Bart van der Schans Fix For: r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 17:32:28 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 17:36:55 2010 Subject: [HippoRepos-dev] [22084] hippo-ecm/trunk: HREPTWO-3966: Remove duplicate entries in poms needed. Message-ID: <20100310163228.3121E1C020@svn.vm.castaserver.com> Revision: 22084 Author: bvdschans Date: 2010-03-10 17:32:27 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3966: Remove duplicate entries in poms needed. Maven 3.0 reports them as errors Modified Paths: -------------- hippo-ecm/trunk/addon/builtin/test/pom.xml hippo-ecm/trunk/addon/reviewed-action/frontend/pom.xml hippo-ecm/trunk/quickstart/bin/pom.xml hippo-ecm/trunk/quickstart/war/pom.xml hippo-ecm/trunk/repository/engine/pom.xml hippo-ecm/trunk/repository/jca/pom.xml hippo-ecm/trunk/repository/test/pom.xml hippo-ecm/trunk/tools/development-content/pom.xml hippo-ecm/trunk/tools/projectexport/pom.xml Modified: hippo-ecm/trunk/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/trunk/addon/builtin/test/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/addon/builtin/test/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -54,20 +54,6 @@ 2.13.00-SNAPSHOT - org.hippoecm - hippo-ecm-frontend-engine - 2.13.00-SNAPSHOT - test - - - - org.hippoecm - hippo-ecm-addon-builtin-repository - 2.13.00-SNAPSHOT - test - - - org.slf4j jcl-over-slf4j test @@ -92,12 +78,6 @@ org.hippoecm - hippo-ecm-repository-engine - 2.13.00-SNAPSHOT - test - - - org.hippoecm hippo-ecm-repository-upgrade 2.13.00-SNAPSHOT test Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/frontend/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/addon/reviewed-action/frontend/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -68,11 +68,6 @@ org.hippoecm - hippo-ecm-addon-workflow - 2.13.00-SNAPSHOT - - - org.hippoecm hippo-ecm-addon-yui 2.13.00-SNAPSHOT Modified: hippo-ecm/trunk/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/trunk/quickstart/bin/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/quickstart/bin/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -67,11 +67,6 @@ org.mortbay.jetty - jetty - 6.1.12 - - - org.mortbay.jetty jetty-util 6.1.12 Modified: hippo-ecm/trunk/quickstart/war/pom.xml =================================================================== --- hippo-ecm/trunk/quickstart/war/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/quickstart/war/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -431,7 +431,7 @@ maven-jetty-plugin ${jetty.version} - 5 + 0 8080 @@ -440,6 +440,7 @@ jetty-config/jetty-env.xml /cms + ../../repository/application/target/classes/;../../repository/engine/target/classes/;../../repository/modules/target/classes/;../../frontend/engine/target/classes;../../frontend/plugins/target/classes/; -org.mortbay.jetty.plus.jaas. Modified: hippo-ecm/trunk/repository/engine/pom.xml =================================================================== --- hippo-ecm/trunk/repository/engine/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/repository/engine/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -246,7 +246,7 @@ org.apache.maven.plugins maven-surefire-plugin - always + never ${project.build.directory} Modified: hippo-ecm/trunk/repository/jca/pom.xml =================================================================== --- hippo-ecm/trunk/repository/jca/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/repository/jca/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -147,10 +147,6 @@ test - javax.jcr - jcr - - org.hippoecm hippo-ecm-addon-xinha-frontend 2.13.00-SNAPSHOT @@ -317,11 +313,6 @@ org.hippoecm - hippo-ecm-addon-builtin-repository - 2.13.00-SNAPSHOT - - - org.hippoecm hippo-ecm-frontend-engine 2.13.00-SNAPSHOT Modified: hippo-ecm/trunk/repository/test/pom.xml =================================================================== --- hippo-ecm/trunk/repository/test/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/repository/test/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -79,13 +79,6 @@ 2.13.00-SNAPSHOT - - org.hippoecm - hippo-ecm-repository-engine - 2.13.00-SNAPSHOT - test - - com.atomikos Modified: hippo-ecm/trunk/tools/development-content/pom.xml =================================================================== --- hippo-ecm/trunk/tools/development-content/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/tools/development-content/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -55,12 +55,6 @@ org.hippoecm - hippo-ecm-api - 2.13.00-SNAPSHOT - provided - - - org.hippoecm hippo-ecm-frontend-plugins 2.13.00-SNAPSHOT provided Modified: hippo-ecm/trunk/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/trunk/tools/projectexport/pom.xml 2010-03-10 15:25:35 UTC (rev 22083) +++ hippo-ecm/trunk/tools/projectexport/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) @@ -66,12 +66,6 @@ org.hippoecm - hippo-ecm-repository-engine - 2.13.00-SNAPSHOT - provided - - - org.hippoecm hippo-ecm-tools-testutils 2.13.00-SNAPSHOT test From helpdesk at onehippo.com Wed Mar 10 17:33:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Wed Mar 10 17:38:13 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3966) Make build compatible with maven 3.0 In-Reply-To: <7902146.2258.1268238708576.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <28600458.2264.1268238828657.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3966?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86360#action_86360 ] Bart van der Schans commented on HREPTWO-3966: ---------------------------------------------- Build seems to work, but no extensive testing has been done. Also the current releases are still alpha and some things may still change. > Make build compatible with maven 3.0 > ------------------------------------ > > Key: HREPTWO-3966 > URL: http://issues.onehippo.com/browse/HREPTWO-3966 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Bart van der Schans > Assignee: Bart van der Schans > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Wed Mar 10 17:40:41 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 17:40:38 2010 Subject: [HippoRepos-dev] =?utf-8?q?Build_failed_in_Hudson=3A_Hippo_ECM_T?= =?utf-8?q?runk_=C2=BB_Repository_engine_=231183?= Message-ID: <25331339.371268239241271.JavaMail.hudson@hudson.onehippo.org> See Changes: [bvdschans] HREPTWO-3966: Remove duplicate entries in poms needed. Maven 3.0 reports them as errors ------------------------------------------ [...truncated 167 lines...] test(org.hippoecm.repository.updater.UpdaterTest) testReferences(org.hippoecm.repository.updater.UpdaterTest) testLoginPlainSuccess(org.hippoecm.repository.RepositoryLoginTest) testLoginMD5Success(org.hippoecm.repository.RepositoryLoginTest) testLoginSHA1Success(org.hippoecm.repository.RepositoryLoginTest) testLoginSHA256Success(org.hippoecm.repository.RepositoryLoginTest) testLoginPlainFail(org.hippoecm.repository.RepositoryLoginTest) testLoginHashFail(org.hippoecm.repository.RepositoryLoginTest) testLoginNoEmptyPassword(org.hippoecm.repository.RepositoryLoginTest) testLoginNoNullPassword(org.hippoecm.repository.RepositoryLoginTest) testLoginNullUsername(org.hippoecm.repository.RepositoryLoginTest) testLoginNullUsernameNullPassword(org.hippoecm.repository.RepositoryLoginTest) testLoginAnonymous(org.hippoecm.repository.RepositoryLoginTest) testIssue(org.hippoecm.repository.HREPTWO456Test) testDatesFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationDateBrowsingTest) testStoreAsNodeWithType(org.hippoecm.repository.HippoQueryTest) testFacetIssues(org.hippoecm.repository.FacetedNavigationChildNameTest) testIssue(org.hippoecm.repository.HREPTWO280Test) testIssue(org.hippoecm.repository.HREPTWO475Test) testDates(org.hippoecm.repository.HREPTWO650Test) testSanity(org.hippoecm.repository.HippoNodeTypeSanityTest) testSessionLiveTest(org.hippoecm.repository.BoilerPlateTest) testIssue(org.hippoecm.repository.HREPTWO283IssueTest) testNoBadRemove(org.hippoecm.repository.HREPTWO283IssueTest) testIssue(org.hippoecm.repository.HREPTWO3402IssueTest) testFacetedSingledocumentView(org.hippoecm.repository.decorating.SingledViewFacetSelectTest) testTrivialMultipleTraverseVirtualNavigation(org.hippoecm.repository.HippoISMTest) testSaveRefetchExternalNode(org.hippoecm.repository.HippoISMTest) testSaveNoRefetchExternalNode(org.hippoecm.repository.HippoISMTest) testCorrectRemoveExternalNodeSave(org.hippoecm.repository.HippoISMTest) testWrongRemoveExternalNodeSave(org.hippoecm.repository.HippoISMTest) testCorrectRemoveVirtualNodeSave(org.hippoecm.repository.HippoISMTest) testWrongRemoveVirtualNodeSave(org.hippoecm.repository.HippoISMTest) testTraversal(org.hippoecm.repository.FacetedNavigationTest) testCounts(org.hippoecm.repository.FacetedNavigationTest) testGetItemFromSession(org.hippoecm.repository.FacetedNavigationTest) testGetItemFromNode(org.hippoecm.repository.FacetedNavigationTest) testVirtualNodeHasNoJcrUUID(org.hippoecm.repository.FacetedNavigationTest) testAddingNodesOpenFacetSearch(org.hippoecm.repository.FacetedNavigationTest) testPerformance(org.hippoecm.repository.FacetedNavigationTest) testStopWords(org.hippoecm.repository.StandardHippoAnalyzerTest) testDiacritics(org.hippoecm.repository.StandardHippoAnalyzerTest) testBasics(org.hippoecm.repository.BasicTest) testRequestsLast(org.hippoecm.repository.FacetSelectTest) testRequestsLast(org.hippoecm.repository.FacetSelectTest) testBasics(org.hippoecm.repository.FacetSelectTest) testBasics(org.hippoecm.repository.FacetSelectTest) testSubtyped(org.hippoecm.repository.FacetSelectTest) testSubtyped(org.hippoecm.repository.FacetSelectTest) testNoRoot(org.hippoecm.repository.FacetSelectTest) testNoRoot(org.hippoecm.repository.FacetSelectTest) testNotAllowedCombineDirect(org.hippoecm.repository.FacetSelectTest) testNotAllowedCombineDirect(org.hippoecm.repository.FacetSelectTest) testCombineIndirect(org.hippoecm.repository.FacetSelectTest) testCombineIndirect(org.hippoecm.repository.FacetSelectTest) testEqualsFilteredNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testNotEqualsFilteredNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testEqualsPrimTypeFilteredNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testTextContainsNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testTextNotContainsNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testNotAllowedWildcardPrefixNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testPropertyTextContainsNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testPhraseTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testWildcardTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testNodeScopeFreeTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testBoostingTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testSimpleFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testFirstLevelChildNodeFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testSecondLevelChildNodeFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testSecondChildNodeBinaryFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testDeleteFirstLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testDeleteSecondLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testAddFirstLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testAddSecondLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testModifyFirstLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testModifySecondLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testIssue(org.hippoecm.repository.HREPTWO451Test) testSimpleNames(org.hippoecm.repository.NodeNameCodecTest) testPrefixedNames(org.hippoecm.repository.NodeNameCodecTest) testCreateSimpleNames(org.hippoecm.repository.NodeNameCodecTest) testCreatePrefixedNames(org.hippoecm.repository.NodeNameCodecTest) testIssue(org.hippoecm.repository.HREPTWO690Test) testMirror(org.hippoecm.repository.decorating.MirrorTest) testSubTypeMirror(org.hippoecm.repository.decorating.MirrorTest) testParentOfProperty(org.hippoecm.repository.HREPTWO1493Test) testModifyVirtualProperty(org.hippoecm.repository.HREPTWO1493Test) testModifyPropertyAfterBrowsingVirtual(org.hippoecm.repository.HREPTWO1493Test) testFacetedReference(org.hippoecm.repository.decorating.FacetedReferenceTest) testFacetedReference(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOnceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOnceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferSingleDirectOnHandle(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferSingleDirectOnHandle(org.hippoecm.repository.decorating.FacetedReferenceTest) testSimpleMirrorAfterPreferSingle(org.hippoecm.repository.decorating.FacetedReferenceTest) testSimpleMirrorAfterPreferSingle(org.hippoecm.repository.decorating.FacetedReferenceTest) testExport(org.hippoecm.repository.DereferencedExportImportTest) testExport(org.hippoecm.repository.DereferencedExportImportTest) testNormalImport(org.hippoecm.repository.DereferencedExportImportTest) testNormalImport(org.hippoecm.repository.DereferencedExportImportTest) testNodeEncoding(org.hippoecm.repository.DereferencedExportImportTest) testNodeEncoding(org.hippoecm.repository.DereferencedExportImportTest) testPropertyEncoding(org.hippoecm.repository.DereferencedExportImportTest) testPropertyEncoding(org.hippoecm.repository.DereferencedExportImportTest) testReferenceFailImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceFailImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceSkipImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceSkipImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceRootImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceRootImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeFailImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeFailImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeAddImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeAddImport(org.hippoecm.repository.DereferencedExportImportTest) removeAndAddFacetsearch(org.hippoecm.repository.HREPTWO3870IssueTest) testImpersonate(org.hippoecm.repository.ImpersonateTest) testAnonymous(org.hippoecm.repository.ImpersonateTest) testHippoTextBinary(org.hippoecm.repository.PdfExtractionAndIndexingTest) testDummy(org.hippoecm.repository.HREPTWO2655IssueTest) testSearchNodeNameInNodeScope(org.hippoecm.repository.SearchOnNodeNameTest) testSearchNodeNameInProp(org.hippoecm.repository.SearchOnNodeNameTest) testSearchWildcardNodeNameInProp(org.hippoecm.repository.SearchOnNodeNameTest) testSearchWildcardNodeNameInNodeScope(org.hippoecm.repository.SearchOnNodeNameTest) testMirrorInheritFilterFromFacetSelect(org.hippoecm.repository.decorating.MirrorCombiFacetSelectTest) testDummy(org.hippoecm.repository.HREPTWO1104Test) testHippoCount(org.hippoecm.repository.FacetedNavigationHippoCountTest) testMap(org.hippoecm.repository.RepositoryMapTest) testSimple(org.hippoecm.repository.DerivedDataTest) testSimple(org.hippoecm.repository.DerivedDataTest) testAncestors(org.hippoecm.repository.DerivedDataTest) testAncestors(org.hippoecm.repository.DerivedDataTest) testDerivedNotReferenceable(org.hippoecm.repository.DerivedDataTest) testDerivedNotReferenceable(org.hippoecm.repository.DerivedDataTest) testIssue(org.hippoecm.repository.decorating.PathsTest) testPathProperty(org.hippoecm.repository.decorating.PathsTest) testPerformance(org.hippoecm.repository.FacetedNavigationPerfTestCase) testFullFacetedNavigationTraversal(org.hippoecm.repository.FacetedNavigationPerfTestCase) testIssue(org.hippoecm.repository.HREPTWO425Test) testBasicOrdering(org.hippoecm.repository.updater.UpdaterEngineAdministrationTest) testJRCndExport(org.hippoecm.repository.ExportCndTest) testJCROnlyCndExport(org.hippoecm.repository.ExportCndTest) testIssue(org.hippoecm.repository.FacetedSelectVersioningTest) testDirectSingleValuedFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetNodeNameNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testDirectMultiValuedFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testInheritFilterFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetsOnNodeType(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetsOnDateValue(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testSortResultSetOnStringProperty(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testSortResultSetOnLongProperty(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testSortResultSetOnDoubleProperty(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testLimitResultSet(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testWithEmptyFacetValue(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testMultipleScopesFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetSearchCanonicalNodeHasOtherIdTest(org.hippoecm.repository.InternalCanonicalPathTest) testFacetSelectCanonicalNodeHasOtherIdTest(org.hippoecm.repository.InternalCanonicalPathTest) testPhysicalCanonicalNodeHasSameIdTest(org.hippoecm.repository.InternalCanonicalPathTest) testSortingNamesXpathDefault(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesXpathAscending(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesXpathDescending(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesSqlDefault(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesSqlAsc(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesSqlDesc(org.hippoecm.repository.OrderByNodeNameTest) testTrivialNodeOperations(org.hippoecm.repository.TrivialServerTest) testEncodedNode(org.hippoecm.repository.TrivialServerTest) testGuidedFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationGuidedBrowsingTest) testIssue(org.hippoecm.repository.HREPTWO548Test) testIssue(org.hippoecm.repository.HREPTWO548Test) testSanity(org.hippoecm.repository.PendingChangesTest) testSanity(org.hippoecm.repository.PendingChangesTest) testNodeFilter(org.hippoecm.repository.PendingChangesTest) testNodeFilter(org.hippoecm.repository.PendingChangesTest) testManyLoginsWithTraverse(org.hippoecm.repository.MemoryTest) testManyLogins(org.hippoecm.repository.MemoryTest) testReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testQueryXPath(org.hippoecm.repository.FacetedAuthorizationTest) testQueryXPath(org.hippoecm.repository.FacetedAuthorizationTest) testQuerySQL(org.hippoecm.repository.FacetedAuthorizationTest) testQuerySQL(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testDoubleRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testFacetRangeOrdering(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testLongRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testStringRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testTimeZoneDateFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testWeekDateRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testFacetSearchExport(org.hippoecm.repository.PhysicalExportSystemViewTest) testFacetSelectExport(org.hippoecm.repository.PhysicalExportSystemViewTest) testTotalExport(org.hippoecm.repository.PhysicalExportSystemViewTest) testFacetSearchWithoutNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSearchWithNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSearchWithBoth(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSelectWithoutNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSelectWithNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSelectWithBoth(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSortingNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSortingTest) testDescriptorKeys(org.hippoecm.repository.DescriptorsTest) testDescriptors(org.hippoecm.repository.DescriptorsTest) testVirtualTreeCopy(org.hippoecm.repository.CopyNodeTest) testVirtualTreeCopy(org.hippoecm.repository.CopyNodeTest) testTransactionCommit(org.hippoecm.repository.TransactionTest) testTransactionRollback(org.hippoecm.repository.TransactionTest) Tests run: 253, Failures: 0, Errors: 229, Skipped: 0 [ERROR] There are test failures. Please refer to for the individual test results. [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [WARNING] JAR will be empty - no content was marked for inclusion! [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] (No such file or directory) [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 2 minutes 55 seconds [INFO] Finished at: Wed Mar 10 17:40:38 CET 2010 [INFO] Final Memory: 75M/152M [INFO] ------------------------------------------------------------------------ From schans at onehippo.com Wed Mar 10 17:40:42 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 17:40:41 2010 Subject: [HippoRepos-dev] Build failed in Hudson: Hippo ECM Trunk #1183 Message-ID: <359089.381268239242560.JavaMail.hudson@hudson.onehippo.org> See Changes: [bvdschans] HREPTWO-3966: Remove duplicate entries in poms needed. Maven 3.0 reports them as errors ------------------------------------------ [...truncated 732 lines...] testLoginPlainSuccess(org.hippoecm.repository.RepositoryLoginTest) testLoginMD5Success(org.hippoecm.repository.RepositoryLoginTest) testLoginSHA1Success(org.hippoecm.repository.RepositoryLoginTest) testLoginSHA256Success(org.hippoecm.repository.RepositoryLoginTest) testLoginPlainFail(org.hippoecm.repository.RepositoryLoginTest) testLoginHashFail(org.hippoecm.repository.RepositoryLoginTest) testLoginNoEmptyPassword(org.hippoecm.repository.RepositoryLoginTest) testLoginNoNullPassword(org.hippoecm.repository.RepositoryLoginTest) testLoginNullUsername(org.hippoecm.repository.RepositoryLoginTest) testLoginNullUsernameNullPassword(org.hippoecm.repository.RepositoryLoginTest) testLoginAnonymous(org.hippoecm.repository.RepositoryLoginTest) testIssue(org.hippoecm.repository.HREPTWO456Test) testDatesFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationDateBrowsingTest) testStoreAsNodeWithType(org.hippoecm.repository.HippoQueryTest) testFacetIssues(org.hippoecm.repository.FacetedNavigationChildNameTest) testIssue(org.hippoecm.repository.HREPTWO280Test) testIssue(org.hippoecm.repository.HREPTWO475Test) testDates(org.hippoecm.repository.HREPTWO650Test) testSanity(org.hippoecm.repository.HippoNodeTypeSanityTest) testSessionLiveTest(org.hippoecm.repository.BoilerPlateTest) testIssue(org.hippoecm.repository.HREPTWO283IssueTest) testNoBadRemove(org.hippoecm.repository.HREPTWO283IssueTest) testIssue(org.hippoecm.repository.HREPTWO3402IssueTest) testFacetedSingledocumentView(org.hippoecm.repository.decorating.SingledViewFacetSelectTest) testTrivialMultipleTraverseVirtualNavigation(org.hippoecm.repository.HippoISMTest) testSaveRefetchExternalNode(org.hippoecm.repository.HippoISMTest) testSaveNoRefetchExternalNode(org.hippoecm.repository.HippoISMTest) testCorrectRemoveExternalNodeSave(org.hippoecm.repository.HippoISMTest) testWrongRemoveExternalNodeSave(org.hippoecm.repository.HippoISMTest) testCorrectRemoveVirtualNodeSave(org.hippoecm.repository.HippoISMTest) testWrongRemoveVirtualNodeSave(org.hippoecm.repository.HippoISMTest) testTraversal(org.hippoecm.repository.FacetedNavigationTest) testCounts(org.hippoecm.repository.FacetedNavigationTest) testGetItemFromSession(org.hippoecm.repository.FacetedNavigationTest) testGetItemFromNode(org.hippoecm.repository.FacetedNavigationTest) testVirtualNodeHasNoJcrUUID(org.hippoecm.repository.FacetedNavigationTest) testAddingNodesOpenFacetSearch(org.hippoecm.repository.FacetedNavigationTest) testPerformance(org.hippoecm.repository.FacetedNavigationTest) testStopWords(org.hippoecm.repository.StandardHippoAnalyzerTest) testDiacritics(org.hippoecm.repository.StandardHippoAnalyzerTest) testBasics(org.hippoecm.repository.BasicTest) testRequestsLast(org.hippoecm.repository.FacetSelectTest) testRequestsLast(org.hippoecm.repository.FacetSelectTest) testBasics(org.hippoecm.repository.FacetSelectTest) testBasics(org.hippoecm.repository.FacetSelectTest) testSubtyped(org.hippoecm.repository.FacetSelectTest) testSubtyped(org.hippoecm.repository.FacetSelectTest) testNoRoot(org.hippoecm.repository.FacetSelectTest) testNoRoot(org.hippoecm.repository.FacetSelectTest) testNotAllowedCombineDirect(org.hippoecm.repository.FacetSelectTest) testNotAllowedCombineDirect(org.hippoecm.repository.FacetSelectTest) testCombineIndirect(org.hippoecm.repository.FacetSelectTest) testCombineIndirect(org.hippoecm.repository.FacetSelectTest) testEqualsFilteredNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testNotEqualsFilteredNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testEqualsPrimTypeFilteredNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testTextContainsNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testTextNotContainsNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testNotAllowedWildcardPrefixNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testPropertyTextContainsNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testPhraseTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testWildcardTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testNodeScopeFreeTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testBoostingTextNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationFilteredTest) testSimpleFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testFirstLevelChildNodeFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testSecondLevelChildNodeFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testSecondChildNodeBinaryFreeTextSearch(org.hippoecm.repository.FreeTextSearchTest) testDeleteFirstLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testDeleteSecondLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testAddFirstLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testAddSecondLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testModifyFirstLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testModifySecondLevelChildNode(org.hippoecm.repository.FreeTextSearchTest) testIssue(org.hippoecm.repository.HREPTWO451Test) testSimpleNames(org.hippoecm.repository.NodeNameCodecTest) testPrefixedNames(org.hippoecm.repository.NodeNameCodecTest) testCreateSimpleNames(org.hippoecm.repository.NodeNameCodecTest) testCreatePrefixedNames(org.hippoecm.repository.NodeNameCodecTest) testIssue(org.hippoecm.repository.HREPTWO690Test) testMirror(org.hippoecm.repository.decorating.MirrorTest) testSubTypeMirror(org.hippoecm.repository.decorating.MirrorTest) testParentOfProperty(org.hippoecm.repository.HREPTWO1493Test) testModifyVirtualProperty(org.hippoecm.repository.HREPTWO1493Test) testModifyPropertyAfterBrowsingVirtual(org.hippoecm.repository.HREPTWO1493Test) testFacetedReference(org.hippoecm.repository.decorating.FacetedReferenceTest) testFacetedReference(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOnceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferenceOnceOrder(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferSingleDirectOnHandle(org.hippoecm.repository.decorating.FacetedReferenceTest) testPreferSingleDirectOnHandle(org.hippoecm.repository.decorating.FacetedReferenceTest) testSimpleMirrorAfterPreferSingle(org.hippoecm.repository.decorating.FacetedReferenceTest) testSimpleMirrorAfterPreferSingle(org.hippoecm.repository.decorating.FacetedReferenceTest) testExport(org.hippoecm.repository.DereferencedExportImportTest) testExport(org.hippoecm.repository.DereferencedExportImportTest) testNormalImport(org.hippoecm.repository.DereferencedExportImportTest) testNormalImport(org.hippoecm.repository.DereferencedExportImportTest) testNodeEncoding(org.hippoecm.repository.DereferencedExportImportTest) testNodeEncoding(org.hippoecm.repository.DereferencedExportImportTest) testPropertyEncoding(org.hippoecm.repository.DereferencedExportImportTest) testPropertyEncoding(org.hippoecm.repository.DereferencedExportImportTest) testReferenceFailImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceFailImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceSkipImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceSkipImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceRootImport(org.hippoecm.repository.DereferencedExportImportTest) testReferenceRootImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeFailImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeFailImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeAddImport(org.hippoecm.repository.DereferencedExportImportTest) testMergeAddImport(org.hippoecm.repository.DereferencedExportImportTest) removeAndAddFacetsearch(org.hippoecm.repository.HREPTWO3870IssueTest) testImpersonate(org.hippoecm.repository.ImpersonateTest) testAnonymous(org.hippoecm.repository.ImpersonateTest) testHippoTextBinary(org.hippoecm.repository.PdfExtractionAndIndexingTest) testDummy(org.hippoecm.repository.HREPTWO2655IssueTest) testSearchNodeNameInNodeScope(org.hippoecm.repository.SearchOnNodeNameTest) testSearchNodeNameInProp(org.hippoecm.repository.SearchOnNodeNameTest) testSearchWildcardNodeNameInProp(org.hippoecm.repository.SearchOnNodeNameTest) testSearchWildcardNodeNameInNodeScope(org.hippoecm.repository.SearchOnNodeNameTest) testMirrorInheritFilterFromFacetSelect(org.hippoecm.repository.decorating.MirrorCombiFacetSelectTest) testDummy(org.hippoecm.repository.HREPTWO1104Test) testHippoCount(org.hippoecm.repository.FacetedNavigationHippoCountTest) testMap(org.hippoecm.repository.RepositoryMapTest) testSimple(org.hippoecm.repository.DerivedDataTest) testSimple(org.hippoecm.repository.DerivedDataTest) testAncestors(org.hippoecm.repository.DerivedDataTest) testAncestors(org.hippoecm.repository.DerivedDataTest) testDerivedNotReferenceable(org.hippoecm.repository.DerivedDataTest) testDerivedNotReferenceable(org.hippoecm.repository.DerivedDataTest) testIssue(org.hippoecm.repository.decorating.PathsTest) testPathProperty(org.hippoecm.repository.decorating.PathsTest) testPerformance(org.hippoecm.repository.FacetedNavigationPerfTestCase) testFullFacetedNavigationTraversal(org.hippoecm.repository.FacetedNavigationPerfTestCase) testIssue(org.hippoecm.repository.HREPTWO425Test) testBasicOrdering(org.hippoecm.repository.updater.UpdaterEngineAdministrationTest) testJRCndExport(org.hippoecm.repository.ExportCndTest) testJCROnlyCndExport(org.hippoecm.repository.ExportCndTest) testIssue(org.hippoecm.repository.FacetedSelectVersioningTest) testDirectSingleValuedFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetNodeNameNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testDirectMultiValuedFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testInheritFilterFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetsOnNodeType(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetsOnDateValue(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testSortResultSetOnStringProperty(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testSortResultSetOnLongProperty(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testSortResultSetOnDoubleProperty(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testLimitResultSet(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testWithEmptyFacetValue(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testMultipleScopesFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSimpleTest) testFacetSearchCanonicalNodeHasOtherIdTest(org.hippoecm.repository.InternalCanonicalPathTest) testFacetSelectCanonicalNodeHasOtherIdTest(org.hippoecm.repository.InternalCanonicalPathTest) testPhysicalCanonicalNodeHasSameIdTest(org.hippoecm.repository.InternalCanonicalPathTest) testSortingNamesXpathDefault(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesXpathAscending(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesXpathDescending(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesSqlDefault(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesSqlAsc(org.hippoecm.repository.OrderByNodeNameTest) testSortingNamesSqlDesc(org.hippoecm.repository.OrderByNodeNameTest) testTrivialNodeOperations(org.hippoecm.repository.TrivialServerTest) testEncodedNode(org.hippoecm.repository.TrivialServerTest) testGuidedFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationGuidedBrowsingTest) testIssue(org.hippoecm.repository.HREPTWO548Test) testIssue(org.hippoecm.repository.HREPTWO548Test) testSanity(org.hippoecm.repository.PendingChangesTest) testSanity(org.hippoecm.repository.PendingChangesTest) testNodeFilter(org.hippoecm.repository.PendingChangesTest) testNodeFilter(org.hippoecm.repository.PendingChangesTest) testManyLoginsWithTraverse(org.hippoecm.repository.MemoryTest) testManyLogins(org.hippoecm.repository.MemoryTest) testReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubReadsNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubWritesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testSubDeletesNotAllowed(org.hippoecm.repository.FacetedAuthorizationTest) testQueryXPath(org.hippoecm.repository.FacetedAuthorizationTest) testQueryXPath(org.hippoecm.repository.FacetedAuthorizationTest) testQuerySQL(org.hippoecm.repository.FacetedAuthorizationTest) testQuerySQL(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrRead(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testCheckPermissionNotPrivilegeJcrWrite(org.hippoecm.repository.FacetedAuthorizationTest) testDoubleRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testFacetRangeOrdering(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testLongRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testStringRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testTimeZoneDateFacetNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testWeekDateRanges(org.hippoecm.repository.facetnavigation.FacetedNavigationRangesTest) testFacetSearchExport(org.hippoecm.repository.PhysicalExportSystemViewTest) testFacetSelectExport(org.hippoecm.repository.PhysicalExportSystemViewTest) testTotalExport(org.hippoecm.repository.PhysicalExportSystemViewTest) testFacetSearchWithoutNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSearchWithNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSearchWithBoth(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSelectWithoutNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSelectWithNamespace(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSelectWithBoth(org.hippoecm.repository.FacetedNavigationNamespaceTest) testFacetSortingNavigation(org.hippoecm.repository.facetnavigation.FacetedNavigationSortingTest) testDescriptorKeys(org.hippoecm.repository.DescriptorsTest) testDescriptors(org.hippoecm.repository.DescriptorsTest) testVirtualTreeCopy(org.hippoecm.repository.CopyNodeTest) testVirtualTreeCopy(org.hippoecm.repository.CopyNodeTest) testTransactionCommit(org.hippoecm.repository.TransactionTest) testTransactionRollback(org.hippoecm.repository.TransactionTest) Tests run: 253, Failures: 0, Errors: 229, Skipped: 0 [ERROR] There are test failures. Please refer to for the individual test results. [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [WARNING] JAR will be empty - no content was marked for inclusion! [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] (No such file or directory) [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 2 minutes 55 seconds [INFO] Finished at: Wed Mar 10 17:40:38 CET 2010 [INFO] Final Memory: 75M/152M [INFO] ------------------------------------------------------------------------ Sending e-mails to: hipporepos-dev@lists.onehippo.org channel stopped From helpdesk at onehippo.com Wed Mar 10 17:42:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:47:16 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <23466265.2266.1268239368628.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86361#action_86361 ] Sylvain P?lissier commented on HREPTWO-3963: -------------------------------------------- There are at least two ways to import an image: via Add an Image from the contextual menu and via Upload form an already existing image. Because I failed to upload that specific image from the menu, I tried to replace a previously successfully uploaded picture. That is when I saw the following displayed: javax.jcr.ValueFormatException: mismatch image mime type See that on screenshot upload_fail.png > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Attachments: cashel_hippo.jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:42:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:47:18 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3729985.2274.1268239368741.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3963: --------------------------------------- Attachment: upload_fail.png > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Attachments: cashel_hippo.jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:42:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:47:21 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <7483006.2272.1268239368714.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3963: --------------------------------------- Attachment: cashel_hippo.jpg > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Attachments: cashel_hippo.jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:42:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:47:24 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22992639.2268.1268239368657.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3963: --------------------------------------- Attachment: (was: cashel_hippo.jpg) > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Attachments: cashel_hippo.jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:44:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:49:14 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <5248022.2276.1268239488556.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3963: --------------------------------------- Attachment: cashel_hippo_jpg > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Attachments: cashel_hippo_jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:44:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:49:17 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8771265.2278.1268239488584.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3963: --------------------------------------- Attachment: (was: cashel_hippo.jpg) > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Attachments: cashel_hippo_jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:44:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:49:19 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22526360.2280.1268239488627.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86363#action_86363 ] Sylvain P?lissier commented on HREPTWO-3963: -------------------------------------------- I replaced the .jpg wit a _jpg so that Jira does not see it as an image in case it does something to it while uploading it. > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Attachments: cashel_hippo_jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 17:47:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Wed Mar 10 17:52:14 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3945) check mime type upon image/asset upload In-Reply-To: <425081.7404.1267786910307.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <16520298.2284.1268239668522.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86365#action_86365 ] Sylvain P?lissier commented on HREPTWO-3945: -------------------------------------------- Questions: - do we allow PDFs to be added to the Image Library? - do we allow JARs when they are renamed as JPGs? Thank you, Sylvain > check mime type upon image/asset upload > --------------------------------------- > > Key: HREPTWO-3945 > URL: http://issues.onehippo.com/browse/HREPTWO-3945 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Berry van Halderen > Assignee: Sylvain P?lissier > Fix For: r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 10 18:01:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Wed Mar 10 18:06:14 2010 Subject: [HippoRepos-dev] [JIRA] Reopened: (HREPTWO-3966) Make build compatible with maven 3.0 In-Reply-To: <7902146.2258.1268238708576.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26505920.2292.1268240508509.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3966?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans reopened HREPTWO-3966: ------------------------------------------ > Make build compatible with maven 3.0 > ------------------------------------ > > Key: HREPTWO-3966 > URL: http://issues.onehippo.com/browse/HREPTWO-3966 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Bart van der Schans > Assignee: Bart van der Schans > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 10 18:02:08 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 10 18:06:35 2010 Subject: [HippoRepos-dev] [22085] hippo-ecm: HREPTWO-3966: Revert accidential commit Message-ID: <20100310170208.5E0DA1C020@svn.vm.castaserver.com> Revision: 22085 Author: bvdschans Date: 2010-03-10 18:02:08 +0100 (Wed, 10 Mar 2010) Log Message: ----------- HREPTWO-3966: Revert accidential commit Modified Paths: -------------- hippo-ecm/trunk/repository/engine/pom.xml Modified: hippo-ecm/trunk/repository/engine/pom.xml =================================================================== --- hippo-ecm/trunk/repository/engine/pom.xml 2010-03-10 16:32:27 UTC (rev 22084) +++ hippo-ecm/trunk/repository/engine/pom.xml 2010-03-10 17:02:08 UTC (rev 22085) @@ -246,7 +246,7 @@ org.apache.maven.plugins maven-surefire-plugin - never + always ${project.build.directory} From schans at onehippo.com Wed Mar 10 19:17:38 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 19:17:35 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_normal_=3A_Hi?= =?utf-8?q?ppo_ECM_Trunk_=C2=BB_Repository_engine_=231184?= In-Reply-To: <25331339.371268239241271.JavaMail.hudson@hudson.onehippo.org> References: <25331339.371268239241271.JavaMail.hudson@hudson.onehippo.org> Message-ID: <12633270.391268245058277.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Wed Mar 10 19:17:41 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Wed Mar 10 19:17:39 2010 Subject: [HippoRepos-dev] Hudson build is back to normal : Hippo ECM Trunk #1184 In-Reply-To: <359089.381268239242560.JavaMail.hudson@hudson.onehippo.org> References: <359089.381268239242560.JavaMail.hudson@hudson.onehippo.org> Message-ID: <8178370.401268245061018.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Thu Mar 11 09:10:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:15:18 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3869) StringCodecFactory issues In-Reply-To: <15176016.820.1266960110389.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2494645.2352.1268295048547.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3869?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3869: ------------------------------------ Fix Version/s: (was: r2.12.07) > StringCodecFactory issues > ------------------------- > > Key: HREPTWO-3869 > URL: http://issues.onehippo.com/browse/HREPTWO-3869 > Project: Hippo Repository 2 > Issue Type: Improvement > Components: repository-interface > Affects Versions: r2.12.04 > Reporter: Rob van der Linden Vooren > Assignee: Berry van Halderen > Priority: High > Fix For: r2.13.00 > > Attachments: StringCodecFactory-rev21850.zip > > > StringCodecFactory was introduced to support readable urls and is currently used in core Hippo CMS Plugins. > Our project relies on this infrastructure factory in order to hook up our custom naming scheme. > In the process of implementing the custom naming scheme, I found some issues with the current implementation as mentioned below. > 1] direct use of Class.forName introduces potential class loading issues > 2] any exception that could occur loading a StringCodec class or instantiating it, are silently swallowed, returning null > 3] StringCodecs class definitions are reloaded on each 'getStringCodec(String ...)' call, introducing a performance hit > 4] 'getStringCodec()' method is unused and even when called would produce NullPointerException > 5] missing documentation > 6] missing behavior change detectors (tests) > I have addressed these issues in the patch attached (for trunk, rev 21850). > Please review. > Kind regards, > Rob van der Linden Vooren -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:29:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:34:17 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3696) Develop html/css for sales demo In-Reply-To: <18792053.221921264516740277.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <25618300.2379.1268296188588.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3696?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3696: ------------------------------------ Fix Version/s: ongoing > Develop html/css for sales demo > -------------------------------- > > Key: HREPTWO-3696 > URL: http://issues.onehippo.com/browse/HREPTWO-3696 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Stephan Westen > Assignee: Robbert Kauffman > Fix For: ongoing > > > Planned for feb -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:29:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:34:19 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3661) Repository architecture drawing In-Reply-To: <22238250.185261263811260373.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <13059561.2382.1268296188639.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3661?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3661: ------------------------------------ Fix Version/s: r2.13.00 > Repository architecture drawing > ------------------------------- > > Key: HREPTWO-3661 > URL: http://issues.onehippo.com/browse/HREPTWO-3661 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Stephan Westen > Assignee: Rolf van der Steen > Fix For: r2.13.00 > > Attachments: Hippo Repository.odg, screenshot-1.jpg > > > see attachments -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:31:49 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:36:20 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3846) Calendar should disappear when its container no more in focus In-Reply-To: <10582097.164.1266920030885.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26356052.2393.1268296309952.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3846?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3846: ------------------------------------ Fix Version/s: r2.13.00 > Calendar should disappear when its container no more in focus > ------------------------------------------------------------- > > Key: HREPTWO-3846 > URL: http://issues.onehippo.com/browse/HREPTWO-3846 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04-SNAPSHOT build 21798 > (Hippo Repository 2.12.04-SNAPSHOT build 21798) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > Attachments: calendar_should_close.png > > > STEPS: > ------ > 1/ Go create a new namespace ('work', 'http://www.work.net/0.1'). > 2/ Edit the basedocument, notice it has three Date fields: Creation, Modification, Publication and corresponding three Calendars. > 3/ Click on one of the Calendars, then on another and see that the previous one is still open. > 4/ I don't think this is the intended behavior, and I expect the previous calendar to be closed when I clicked the mouse on another widget (thus making it active). > Note: alternative to 2/ is to click on one Calendar, then click on any other widget on that same document type, one without a Calendar. The previously open Calendar should be closed when t he other widget gets in focus. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:31:49 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:36:22 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3884) String/Text field is not visible In-Reply-To: <31665085.2232.1267094750361.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2837471.2390.1268296309892.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3884?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3884: ------------------------------------ Assignee: Frank van Lankvelt Fix Version/s: r2.13.00 > String/Text field is not visible > -------------------------------- > > Key: HREPTWO-3884 > URL: http://issues.onehippo.com/browse/HREPTWO-3884 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 > (Hippo Repository 2.12.04) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > After I click to add primitive field of type Text or String the message 'Path mynamespace:string already exists, not adding field' is displayed although the field is not visible as such. Looking at the console the field is found with the wrong type (Text for String and vice-versa). > STEPS > ----- > - Add a new namespace mynamespace > - Add a new document type doctype_one > - Insert a String and change its values Caption and Path to String1, string1 > - Insert a Text and change its values Caption and Path to Text1, text1 > - Insert a String, and move it to the top > - Insert a Text > - Delete both Text and String > - Insert a String > - Insert a String > In the tomcat console: > 25.02.2010 11:44:22 ERROR [org.hippoecm.frontend.plugin.config.impl.JcrClusterConfig$PluginList.add():171] /hippo:namespaces/mynamespace/doctype_one/editor:templates/_default_/string > 25.02.2010 11:44:22 ERROR [org.hippoecm.editor.type.JcrTypeDescriptor.addField():199] failed to resolve path null relative to node /hippo:namespaces/mynamespace/doctype_one/hipposysedit:nodetype/hipposysedit:nodetype: empty path -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:31:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:36:26 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3963) Attached image file that cannot be added to 'Images' In-Reply-To: <19504701.2216.1268237448655.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2761338.2399.1268296310112.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3963?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3963: ------------------------------------ Fix Version/s: r2.12.07 > Attached image file that cannot be added to 'Images' > ---------------------------------------------------- > > Key: HREPTWO-3963 > URL: http://issues.onehippo.com/browse/HREPTWO-3963 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: IE and Ffx > Reporter: Sylvain P?lissier > Assignee: Berry van Halderen > Fix For: r2.12.07 > > Attachments: cashel_hippo_jpg, upload_fail.png > > > While testing https://issues.onehippo.com/browse/HREPTWO-3945 I realized that some supported extension would raise an error 'Ongeldige invoer.' or 'Invalid content.'. > I just tested other images with that extension, smaller and bigger ones. And they worked fine. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:31:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:36:29 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3921) console skin not found when installing console as servlet In-Reply-To: <1854852.6050.1267625270320.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <16769540.2396.1268296310028.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3921?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3921: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 Priority: Low (was: Normal) > console skin not found when installing console as servlet > --------------------------------------------------------- > > Key: HREPTWO-3921 > URL: http://issues.onehippo.com/browse/HREPTWO-3921 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06, r2.13.00 > Reporter: Berry van Halderen > Assignee: Arthur Bogaart > Priority: Low > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:31:50 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:36:34 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3950) No wrapping of the breadcrumb along the Link Picker dialogs border in Internet Explorer In-Reply-To: <17045026.7640.1267806110606.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <1314835.2402.1268296310172.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3950?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3950: ------------------------------------ Assignee: Vijay Kiran Fix Version/s: r2.13.00 > No wrapping of the breadcrumb along the Link Picker dialogs border in Internet Explorer > --------------------------------------------------------------------------------------- > > Key: HREPTWO-3950 > URL: http://issues.onehippo.com/browse/HREPTWO-3950 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.13.00 > Environment: n/a > Reporter: Sylvain P?lissier > Assignee: Vijay Kiran > Fix For: r2.13.00 > > Attachments: breadcrumb_wrapping.png > > > See also http://issues.onehippo.com/browse/HREPTWO-3949. > On the attached screenshot one notices that the breadcrumb is treated differently depending on the type of browser that is used. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:33:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:38:22 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3902) The upload button on the Resource dialog does not have the clickable look&feel In-Reply-To: <17509059.3311.1267201130339.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <7607699.2415.1268296428894.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3902?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3902: ------------------------------------ Priority: Low (was: Normal) > The upload button on the Resource dialog does not have the clickable look&feel > ------------------------------------------------------------------------------ > > Key: HREPTWO-3902 > URL: http://issues.onehippo.com/browse/HREPTWO-3902 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Priority: Low > Fix For: r2.13.00 > > Attachments: screenshot.png > > > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:33:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:38:26 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3949) Link Picker in Mozilla Firefox - invisible document in a deeply nested folder structure In-Reply-To: <14189528.7626.1267805630570.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <20189633.2405.1268296428749.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3949?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3949: ------------------------------------ Assignee: Vijay Kiran Fix Version/s: r2.13.00 > Link Picker in Mozilla Firefox - invisible document in a deeply nested folder structure > --------------------------------------------------------------------------------------- > > Key: HREPTWO-3949 > URL: http://issues.onehippo.com/browse/HREPTWO-3949 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.13.00 > Reporter: Sylvain P?lissier > Assignee: Vijay Kiran > Fix For: r2.13.00 > > > STEPS (to be performed with Firefox, then with Internet Explorer): > ------ > - add the following structure under Documents: (screen0) > myfolder > \_myfolder0 > \_myfolder1 > \_myfolder2 > \_myfolder3 > \_myfolder4 > \_myfolder5 > \_myfolder6 > \_myfolder7 > \_mydoc > - edit mynews1 > - click [...] within Link > - try to select mydoc (first by clicking the folders in the treeview TV, then by clicking the folders in the listview LV) > You will notice that it is impossible to link to mydoc under Firefox, no matter how you reach it TV/LV. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:33:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:38:30 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3902) The upload button on the Resource dialog does not have the clickable look&feel In-Reply-To: <17509059.3311.1267201130339.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10472542.2412.1268296428849.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3902?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3902: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 > The upload button on the Resource dialog does not have the clickable look&feel > ------------------------------------------------------------------------------ > > Key: HREPTWO-3902 > URL: http://issues.onehippo.com/browse/HREPTWO-3902 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > Attachments: screenshot.png > > > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:33:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:38:32 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3836) Moving nodes with console under a restricted location will not appear for a restricted user In-Reply-To: <861784.2411266592093972.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <28071533.2408.1268296428793.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3836?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3836: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 > Moving nodes with console under a restricted location will not appear for a restricted user > ------------------------------------------------------------------------------------------- > > Key: HREPTWO-3836 > URL: http://issues.onehippo.com/browse/HREPTWO-3836 > Project: Hippo Repository 2 > Issue Type: Bug > Components: console > Affects Versions: r2.12.02 > Reporter: Jeroen Hoffman > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > > In a setup where a user group has access to only one specific subfolder under /content/documents, /content/assets and /content/gallery (let's say 'restricted'): > - admin user creates root folder 'test' with CMS > - admin user create document, image or asset in the folder with CMS > - admin user moves folder 'test' under folder 'restricted' using Move Node in console > - the test doc/asset/image does NOT show for the restricted user in CMS > - only the handle of the test doc/asset/image shows for the restricted user in console -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:35:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:40:21 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3940) how to assign roles to users and/or groups In-Reply-To: <3944610.7275.1267780910347.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <32587839.2418.1268296548635.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3940?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3940: ------------------------------------ Assignee: Bart van der Schans Fix Version/s: r2.13.00 > how to assign roles to users and/or groups > ------------------------------------------ > > Key: HREPTWO-3940 > URL: http://issues.onehippo.com/browse/HREPTWO-3940 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > Assignee: Bart van der Schans > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:35:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:40:25 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3917) SectionTreePlugin shows only browsed folders In-Reply-To: <8229280.5981.1267623170489.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <3785984.2421.1268296548688.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3917?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3917: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 > SectionTreePlugin shows only browsed folders > -------------------------------------------- > > Key: HREPTWO-3917 > URL: http://issues.onehippo.com/browse/HREPTWO-3917 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Berry van Halderen > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > > When browsing using the DocumentListingPlugin, the SectionTreePlugin follows the browsed path, but only displays the path actually browsed. It does not show other folders at the same level as if you would have browsed by clicking the same path in the SectionTreePlugin -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:35:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:40:30 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3903) Icon not set for a new file added to the library In-Reply-To: <20015554.4305.1267451630394.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17175159.2424.1268296548745.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3903?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3903: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 > Icon not set for a new file added to the library > ------------------------------------------------ > > Key: HREPTWO-3903 > URL: http://issues.onehippo.com/browse/HREPTWO-3903 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > Attachments: document_icons.png > > > When a Microsoft Office file is added by means of the Assets 'Add a file to the library' dialog, it gets a generic icon. > When later the same file is uploaded again by means of the Upload button that is available on the document form resulting form the above operation, it gets a specific Microsoft Office icon. > STEPS: > ------ > - do Add a File from Assets > hippos (quickstart) > - select a .doc or a .xls file > - verify the icon in the Folder Tabulation panel looks 'generic' like on the attached screenshot > - edit this document and upload the (same) file again (Browse to the file, then Upload it) > - now the icon should be the 'default' blue W or green X, depending on the type uploaded above. > Note also that I have not been able to reorder the content of Assets so that the assets with the generic icon would appear first in the list. Should I put it be in Jira too? > Note also that I will log another similar/related? issue separately. It has to do with adding images to Assets and whether or not a thumbnail is created. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:37:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:42:18 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3873) Messages stacking up without distinction In-Reply-To: <24840271.1071.1267008770340.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30641793.2429.1268296668717.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3873?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3873: ------------------------------------ Fix Version/s: r2.13.00 > Messages stacking up without distinction > ---------------------------------------- > > Key: HREPTWO-3873 > URL: http://issues.onehippo.com/browse/HREPTWO-3873 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 build 21834 > (Hippo Repository 2.12.04 build 21834) > Reporter: Sylvain P?lissier > Assignee: Rolf van der Steen > Fix For: r2.13.00 > > Attachments: rejected_requests.png > > > The message informing the user when a request was not accepted stays in the message area after another, subsequent, request was rejected thus issuing another message. > This goes on and on, and since there is no other detail than 'Request Rejected' this information has very little meaning in such a specific use case. > STEPS > ----- > %BEGIN_LOOP% > - as 'author' request a publication > - as 'admin' reject the publication > %END_LOOP% > I did five iterations and I have attached a screenshot of the resulting accumulated messages. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:37:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:42:20 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3913) Check if UpdaterItemVisitor does correct check for if node is virtual or not In-Reply-To: <30545765.5507.1267544690496.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <12802453.2432.1268296668774.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3913?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3913: ------------------------------------ Fix Version/s: r2.13.00 > Check if UpdaterItemVisitor does correct check for if node is virtual or not > ---------------------------------------------------------------------------- > > Key: HREPTWO-3913 > URL: http://issues.onehippo.com/browse/HREPTWO-3913 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Ard Schrijvers > Assignee: Berry van Halderen > Fix For: r2.13.00 > > > In UpdaterItemVisitor there is this logic: > public void visit(Node node) throws RepositoryException { > if(node instanceof HippoNode) { > Node canonical = ((HippoNode) node).getCanonicalNode(); > if(canonical == null || canonical.isSame(node)) { > return; > } > } > It seems to me, that this tries to skip virtual node. But, I think the part > canonical.isSame(node) > must be > !canonical.isSame(node) > We need to check this -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:37:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:42:27 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3879) Search - characters accentuated variants in search term not finding basic character In-Reply-To: <1014475.1253.1267018010434.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10653379.2436.1268296668856.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3879?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3879: ------------------------------------ Assignee: Frank van Lankvelt (was: Ard Schrijvers) Fix Version/s: r2.13.00 > Search - characters accentuated variants in search term not finding basic character > ----------------------------------------------------------------------------------- > > Key: HREPTWO-3879 > URL: http://issues.onehippo.com/browse/HREPTWO-3879 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 build 21859 > (Hippo Repository 2.12.04 build 21859) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > Variant: a letter derived from another by adding an accent or other diacritic stuff, also its capitalized version > Basic: the letter without any particular additional sign > STEPS > ----- > - put in the title of a document a string such as P?lissier > - search for documents containing the string pelissier > - see the edited document being returned, as expected variants of an e (such as ?) as well as variants of p, such the capital letter P, are valid variants of respectively an e and a p. > so far so good... but > STEPS > ----- > - put in the title of a document a string such as Pelissier > - search for documents containing the string p?lissier > - the document is not found that you just edited: the substitution of the accentuated variant with the basic character was not effective. > Note that the substitution of capitalized letters with their lower-case version is effective both ways: > STEPS: > ------ > - put in the title of a document a string such as pelissier > - search for documents containing the string Pelissier > - the just edited document is returned -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:37:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:42:30 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3891) No wrapping of the text in 'formatted' style In-Reply-To: <14895213.2783.1267176470337.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <9070722.2439.1268296668900.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3891?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3891: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 > No wrapping of the text in 'formatted' style > -------------------------------------------- > > Key: HREPTWO-3891 > URL: http://issues.onehippo.com/browse/HREPTWO-3891 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > Attachments: formatted-style.png > > > See screenshot 'formatted-style'. > The text 'av. Nette kvadrilinio (...)' takes only one line and causes the field to be very large. See the horizontal scrollbar. > STEPS: > ------ > Type a large amount of text, select it and set the 'formatted' style on it. Then reduce the width of the browser window. Somehow, I expect all text to be justified along the borders of the field that contains it, but it does not apply just for this style. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:37:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:42:32 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3936) howto setup authorization on folders In-Reply-To: <8089535.7251.1267780310341.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8455316.2445.1268296668984.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3936?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3936: ------------------------------------ Assignee: Bart van der Schans Fix Version/s: r2.13.00 > howto setup authorization on folders > ------------------------------------ > > Key: HREPTWO-3936 > URL: http://issues.onehippo.com/browse/HREPTWO-3936 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > Assignee: Bart van der Schans > Fix For: r2.13.00 > > > how to enable/disable folders for groups / roles / users > - setting up the template -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:37:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:42:37 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3882) Unmanaged exception - java.lang.Exception - Invalid URL In-Reply-To: <24765439.2158.1267089710365.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29381504.2442.1268296668942.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3882?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3882: ------------------------------------ Assignee: Berry van Halderen Fix Version/s: r2.13.00 > Unmanaged exception - java.lang.Exception - Invalid URL > ------------------------------------------------------- > > Key: HREPTWO-3882 > URL: http://issues.onehippo.com/browse/HREPTWO-3882 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.04 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.04 > (Hippo Repository 2.12.04) > Reporter: Sylvain P?lissier > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Attachments: exception > > > This happens when entering a new namespace and making a typo in the URL. For example, when using a semicolon in place of a colon. > There appears a message 'An error occurred, please retry' in the Create namespace dialog, which is fine, but also an exception (as attached) on the Tomcat console screen. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:39:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:44:17 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3920) Should the default jcr node names that are created through the cms be lowercase? In-Reply-To: <28681147.6006.1267624430527.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <31795990.2448.1268296788902.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3920?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3920: ------------------------------------ Assignee: Berry van Halderen Fix Version/s: r2.13.00 > Should the default jcr node names that are created through the cms be lowercase? > -------------------------------------------------------------------------------- > > Key: HREPTWO-3920 > URL: http://issues.onehippo.com/browse/HREPTWO-3920 > Project: Hippo Repository 2 > Issue Type: Task > Reporter: Ard Schrijvers > Assignee: Berry van Halderen > Fix For: r2.13.00 > > > I think in general, customers prefer lower-case urls over case sensitive urls. Should we by default, have lowercase jcr node names being added through the cms, or not? > So, currently something like 'This is the CMS' becomes 'This-is-the-CMS'. Should we better have 'this-is-the-cms' as default -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:39:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:44:23 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3894) EXCEPTION_ACCESS_VIOLATION with APR based Apache Tomcat Native library In-Reply-To: <7246764.2839.1267179170797.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22238067.2451.1268296788956.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3894?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3894: ------------------------------------ Assignee: Bart van der Schans Fix Version/s: r2.13.00 > EXCEPTION_ACCESS_VIOLATION with APR based Apache Tomcat Native library > ---------------------------------------------------------------------- > > Key: HREPTWO-3894 > URL: http://issues.onehippo.com/browse/HREPTWO-3894 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Bart van der Schans > Fix For: r2.13.00 > > Attachments: hs_err_pid184.log, tco > > > When you start Hippo CMS on Tomcat 6, the following information is displayed: > org.apache.catalina.core.AprLifecycleListener init > INFO: The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path > I found the file in question (tcnative-1.dll) at http://tomcat.heanet.ie/native/1.1.12/binaries/win32/ > I copied it into C:\apache-tomcat-6.0.20\bin and restarted the server > This causes the following: > org.apache.catalina.core.AprLifecycleListener init > INFO: Loaded APR based Apache Tomcat Native library 1.1.12. > org.apache.catalina.core.AprLifecycleListener init > INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. > org.apache.coyote.http11.Http11AprProtocol init > SEVERE: Error initializing endpoint > org.apache.tomcat.jni.Error: An address incompatible with the requested protocol was used. > I copied the whole Tomcat console output into the attached 'tco' file. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:39:49 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:44:25 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3895) Mimicking namespace syntax in an element's Path activates multiplicity of said element In-Reply-To: <7273540.2880.1267180730435.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <28188376.2454.1268296789002.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3895?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3895: ------------------------------------ Assignee: Frank van Lankvelt Fix Version/s: r2.13.00 > Mimicking namespace syntax in an element's Path activates multiplicity of said element > -------------------------------------------------------------------------------------- > > Key: HREPTWO-3895 > URL: http://issues.onehippo.com/browse/HREPTWO-3895 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: exception > > > While editing the Path of a primitive element, the green plus sign appeared but the Multiple checkbox was not set. > STEPS: > ------ > - in a new namespace > - add a new document type > - insert a field in there, such as one of the String type > - edit the property Path, and replace the default 'string' with 'something:string' > - click outside of the Path box to trigger a refresh > ACTUAL: > ------- > - note that the green plus sign appears on the field. This usually indicates this is a multiple field. Note the Multiple checkbox is not ticked. > - note also an exception in the Tomcat console, an example is found in the attached 'exception' file. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:41:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:46:17 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3915) ReferentialIntegrityException if one edits a document while a scheduled request for publication made by an author is pending In-Reply-To: <30730774.5902.1267616630381.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <33250344.2458.1268296908699.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3915?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3915: ------------------------------------ Fix Version/s: r2.13.00 > ReferentialIntegrityException if one edits a document while a scheduled request for publication made by an author is pending > ---------------------------------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3915 > URL: http://issues.onehippo.com/browse/HREPTWO-3915 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Environment: URL: http://svn.hippocms.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_06 > Repository Root: http://svn.hippocms.org/repos/hippo > Repository UUID: 0a3ed2df-7a07-0410-b92e-f844022c69f4 > Revision: 22024 > Node Kind: directory > Schedule: normal > Last Changed Author: bvanhalderen > Last Changed Rev: 22012 > Last Changed Date: 2010-03-02 14:57:51 +0100 (di, 02 mrt 2010) > Reporter: Sylvain P?lissier > Assignee: Berry van Halderen > Priority: High > Fix For: r2.13.00 > > Attachments: jst > > > Raised by TB. > STEPS: > ------ > - as author request a scheduled publication for articles > myarticle2 > - logout > - as admin, edit that document, then hit Save (or Done) > You get an exception in the CMS: javax.jcr.ReferentialIntegrityException: 9f841802-57ed-465e-940c-2914882f9e17: the node cannot be removed because it is still being referenced. > The rest, from the Tomcat console, is attached as 'jst'. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:41:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:46:22 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3818) Standard query template names for gallery and asset folders do not match default read node name In-Reply-To: <23223221.12681266402029048.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <28073824.2465.1268296908805.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3818?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3818: ------------------------------------ Assignee: Frank van Lankvelt Fix Version/s: r2.13.00 > Standard query template names for gallery and asset folders do not match default read node name > ------------------------------------------------------------------------------------------------ > > Key: HREPTWO-3818 > URL: http://issues.onehippo.com/browse/HREPTWO-3818 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.02 > Reporter: Jeroen Hoffman > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > In hippo configuration, the query templates for galleries and assets (located at /hippo:configuration/hippo:queries/hippo:templates/new-image-folder/hippostd:templates and /hippo:configuration/hippo:queries/hippo:templates/new-file-folder/hippostd:templates) and named "image gallery" and "asset gallery". > This does not match the domain rule at /hippo:configuration/hippo:domains/defaultread/template-folder-name/name-folder-template, which states the name "hippostd:folder". > This can cause the problem that restricted users are not able to create gallery and asset folder as they cannot read the template node. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:43:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:48:18 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3901) Picture disappears from the resource primitive field after first use In-Reply-To: <25164435.3299.1267200890443.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2816151.2468.1268297028614.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3901?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3901: ------------------------------------ Assignee: Arthur Bogaart Fix Version/s: r2.13.00 > Picture disappears from the resource primitive field after first use > -------------------------------------------------------------------- > > Key: HREPTWO-3901 > URL: http://issues.onehippo.com/browse/HREPTWO-3901 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > Attachments: screenshot.png > > > The resource primitive from the quickstart has a graphics on it, some blue boxes. It remains visible on a document type, as well as on a document. It disappears after one pushes the Upload button and is replaced with information about the file. > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:45:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:50:21 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3934) Improve documentation In-Reply-To: <17096463.7240.1267780010691.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <23755120.2475.1268297148740.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3934?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3934: ------------------------------------ Fix Version/s: r2.13.00 > Improve documentation > --------------------- > > Key: HREPTWO-3934 > URL: http://issues.onehippo.com/browse/HREPTWO-3934 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Vivek Kumar > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:45:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:50:26 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3937) how to setup folder types (restrict document types) In-Reply-To: <32663245.7255.1267780430407.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <25492451.2478.1268297148791.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3937?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3937: ------------------------------------ Fix Version/s: r2.13.00 > how to setup folder types (restrict document types) > --------------------------------------------------- > > Key: HREPTWO-3937 > URL: http://issues.onehippo.com/browse/HREPTWO-3937 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > Assignee: Rita Bijlsma > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:45:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:50:33 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3939) howto skin the cms (images / colors) In-Reply-To: <11178570.7263.1267780550513.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30477689.2484.1268297148869.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3939?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3939: ------------------------------------ Fix Version/s: r2.13.00 > howto skin the cms (images / colors) > ------------------------------------ > > Key: HREPTWO-3939 > URL: http://issues.onehippo.com/browse/HREPTWO-3939 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > Assignee: Arthur Bogaart > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:45:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:50:38 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3938) howto add a section to the browser In-Reply-To: <13127566.7257.1267780550421.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <27200227.2481.1268297148831.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3938?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3938: ------------------------------------ Fix Version/s: r2.13.00 > howto add a section to the browser > ---------------------------------- > > Key: HREPTWO-3938 > URL: http://issues.onehippo.com/browse/HREPTWO-3938 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > Assignee: Rita Bijlsma > Fix For: r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 09:45:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 09:50:42 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3935) how to use template builder In-Reply-To: <5294067.7249.1267780190349.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10674928.2487.1268297148908.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3935?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3935: ------------------------------------ Fix Version/s: r2.13.00 > how to use template builder > --------------------------- > > Key: HREPTWO-3935 > URL: http://issues.onehippo.com/browse/HREPTWO-3935 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Vivek Kumar > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > how to use it correctly > how the templates can be customized > how the builder can be used > how to use (cms) plugins > how to plug in taxonomy and drop-down boxes > how to export schema (= cnd + type description) for reuse in the project -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 10:36:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Thu Mar 11 10:41:17 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3943) Escape logging servlet output (aka apply button bug) In-Reply-To: <16304944.7399.1267786670389.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <6022192.2548.1268300208644.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3943?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3943: ---------------------------------------- Summary: Escape logging servlet output (aka apply button bug) (was: escape logging servlet output) Description: When viewing the LoggingServlet (/logging) it is possible to edit the html (e.g. using firebug) and change the possible options of the dropdown logger selector. By placing raw HTML as the value of such an option, you are able to inject this HTML into the log4j collection of loggers. When later requesting the LoggingServlet, you are presented with the original raw html. By escaping the logger names this becomes harmless. It is not possible to check whether a logger of that name exist, or whether the presented logger name contains only valid characters, all logger names with all characters are valid and are not all known at any point in time. > Escape logging servlet output (aka apply button bug) > ---------------------------------------------------- > > Key: HREPTWO-3943 > URL: http://issues.onehippo.com/browse/HREPTWO-3943 > Project: Hippo Repository 2 > Issue Type: Sub-task > Affects Versions: r2.12.06 > Reporter: Berry van Halderen > Assignee: Sylvain P?lissier > Fix For: r2.12.07, r2.13.00 > > > When viewing the LoggingServlet (/logging) it is possible to edit the html (e.g. using firebug) and change the possible options of the dropdown logger selector. By placing raw HTML as the value of such an option, you are able to inject this HTML into the log4j collection of loggers. When later requesting the LoggingServlet, you are presented with the original raw html. By escaping the logger names this becomes harmless. > It is not possible to check whether a logger of that name exist, or whether the presented logger name contains only valid characters, all logger names with all characters are valid and are not all known at any point in time. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 11 11:06:57 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 11:11:27 2010 Subject: [HippoRepos-dev] [22087] hippo-ecm: HREPTWO-3963: image info may report microsoft platform generated jpegs as image/pjpeg, this needs to be reset to plain image/jpeg Message-ID: <20100311100657.AD36D1C020@svn.vm.castaserver.com> Revision: 22087 Author: bvanhalderen Date: 2010-03-11 11:06:57 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3963: image info may report microsoft platform generated jpegs as image/pjpeg, this needs to be reset to plain image/jpeg Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-11 10:05:07 UTC (rev 22086) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-11 10:06:57 UTC (rev 22087) @@ -276,8 +276,16 @@ throw new RepositoryException("unexpected error validating mime type", ex); } if (imageInfo.check()) { - if(!imageInfo.getMimeType().equalsIgnoreCase(mimeType)) { - throw new ValueFormatException("mismatch image mime type"); + String imageInfoMimeType = imageInfo.getMimeType(); + if (imageInfoMimeType == null) { + throw new ValueFormatException("impermissable image type content"); + } else { + if(imageInfoMimeType.equals(MIME_IMAGE_PJPEG)) { + imageInfoMimeType = MIME_IMAGE_JPEG; + } + if (!imageInfoMimeType.equalsIgnoreCase(mimeType)) { + throw new ValueFormatException("mismatch image mime type"); + } } } else { throw new ValueFormatException("impermissable image type content"); From helpdesk at onehippo.com Thu Mar 11 11:18:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Thu Mar 11 11:23:17 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3967) Tag 2.12.07 Message-ID: <27997033.2620.1268302728424.JavaMail.jira@jira.vm.castaserver.com> Tag 2.12.07 ----------- Key: HREPTWO-3967 URL: http://issues.onehippo.com/browse/HREPTWO-3967 Project: Hippo Repository 2 Issue Type: Task Affects Versions: r2.12.07 Reporter: Berry van Halderen Assignee: Berry van Halderen Fix For: r2.12.07 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 11 11:20:02 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 11:24:32 2010 Subject: [HippoRepos-dev] [22088] hippo-ecm: HREPTWO-3967: bumb release properties Message-ID: <20100311102002.3E2901C020@svn.vm.castaserver.com> Revision: 22088 Author: bvanhalderen Date: 2010-03-11 11:20:01 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3967: bumb release properties Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/src/main/java/org/hippoecm/Main.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-11 10:06:57 UTC (rev 22087) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-11 10:20:01 UTC (rev 22088) @@ -419,8 +419,8 @@ true true - HREPTWO-3909: - Tag-HREPTWO-v2_12_06 + HREPTWO-3967: + Tag-HREPTWO-v2_12_07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/src/main/java/org/hippoecm/Main.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/src/main/java/org/hippoecm/Main.java 2010-03-11 10:06:57 UTC (rev 22087) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/src/main/java/org/hippoecm/Main.java 2010-03-11 10:20:01 UTC (rev 22088) @@ -49,7 +49,7 @@ } public static void main(String[] args) { - String warFile = "../war/target/hippo-ecm-quickstart-war-2.12.03-SNAPSHOT.war"; + String warFile = "../war/target/hippo-ecm-quickstart-war-2.12.07.war"; if (args.length > 0) { warFile = args[0]; } From svn-logs at hippocms.org Thu Mar 11 11:22:52 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 11:27:25 2010 Subject: [HippoRepos-dev] [22089] hippo-ecm/trunk: HREPTWO-3963: forward port Message-ID: <20100311102253.22A531C020@svn.vm.castaserver.com> Revision: 22089 Author: bvanhalderen Date: 2010-03-11 11:22:52 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3963: forward port Modified Paths: -------------- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java Property Changed: ---------------- hippo-ecm/trunk/ hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/trunk/frontend/test/pom.xml hippo-ecm/trunk/frontend/test/src/test/ hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/trunk/src/site/CMS_logo.png hippo-ecm/trunk/src/site/apt/integration_testing hippo-ecm/trunk/src/site/apt/releasing hippo-ecm/trunk/src/site/hippo_logo.png hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 Modified: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java =================================================================== --- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-11 10:20:01 UTC (rev 22088) +++ hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageUtils.java 2010-03-11 10:22:52 UTC (rev 22089) @@ -276,8 +276,16 @@ throw new RepositoryException("unexpected error validating mime type", ex); } if (imageInfo.check()) { - if(!imageInfo.getMimeType().equalsIgnoreCase(mimeType)) { - throw new ValueFormatException("mismatch image mime type"); + String imageInfoMimeType = imageInfo.getMimeType(); + if (imageInfoMimeType == null) { + throw new ValueFormatException("impermissable image type content"); + } else { + if(imageInfoMimeType.equals(MIME_IMAGE_PJPEG)) { + imageInfoMimeType = MIME_IMAGE_JPEG; + } + if (!imageInfoMimeType.equalsIgnoreCase(mimeType)) { + throw new ValueFormatException("mismatch image mime type"); + } } } else { throw new ValueFormatException("impermissable image type content"); Property changes on: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 Property changes on: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 Property changes on: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 Property changes on: hippo-ecm/trunk/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 Property changes on: hippo-ecm/trunk/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 Property changes on: hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 Property changes on: hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 Property changes on: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 Property changes on: hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 Property changes on: hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 Property changes on: hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 Property changes on: hippo-ecm/trunk/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 Property changes on: hippo-ecm/trunk/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 Property changes on: hippo-ecm/trunk/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 Property changes on: hippo-ecm/trunk/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21923 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 From helpdesk at onehippo.com Thu Mar 11 12:25:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 11 12:30:22 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3901) Picture disappears from the resource primitive field after first use In-Reply-To: <25164435.3299.1267200890443.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <11801938.2744.1268306748548.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3901?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3901: ------------------------------------ Fix Version/s: r2.12.08 > Picture disappears from the resource primitive field after first use > -------------------------------------------------------------------- > > Key: HREPTWO-3901 > URL: http://issues.onehippo.com/browse/HREPTWO-3901 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.12.08, r2.13.00 > > Attachments: screenshot.png > > > The resource primitive from the quickstart has a graphics on it, some blue boxes. It remains visible on a document type, as well as on a document. It disappears after one pushes the Upload button and is replaced with information about the file. > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 12:40:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Thu Mar 11 12:45:20 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3968) during upgrade some templates may fail because hippostdpubwf is not fully known yet. Message-ID: <5182794.2745.1268307648426.JavaMail.jira@jira.vm.castaserver.com> during upgrade some templates may fail because hippostdpubwf is not fully known yet. ------------------------------------------------------------------------------------ Key: HREPTWO-3968 URL: http://issues.onehippo.com/browse/HREPTWO-3968 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07 Reporter: Berry van Halderen Assignee: Berry van Halderen Fix For: r2.12.07 Only seen this problem in docs project, impact is so minimal it can easility be included in 2.12.07 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 11 12:41:17 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 12:45:48 2010 Subject: [HippoRepos-dev] [22093] hippo-ecm: HREPTWO-3968: configuration problems in derived data definition should not block a save call Message-ID: <20100311114117.A36781C020@svn.vm.castaserver.com> Revision: 22093 Author: bvanhalderen Date: 2010-03-11 12:41:17 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3968: configuration problems in derived data definition should not block a save call Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-11 11:31:09 UTC (rev 22092) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-11 11:41:17 UTC (rev 22093) @@ -163,6 +163,9 @@ for(Node modified : recomputeSet) { compute(session.getValueFactory(), derivatesFolder, modified); } + } catch(NamespaceException ex) { + // be lenient against confiuration problems + logger.error(ex.getClass().getName()+": "+ex.getMessage(), ex); } catch(ConstraintViolationException ex) { logger.error(ex.getClass().getName()+": "+ex.getMessage(), ex); } finally { From svn-logs at hippocms.org Thu Mar 11 12:42:30 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 12:47:02 2010 Subject: [HippoRepos-dev] [22094] hippo-ecm/trunk: HREPTWO-3968: configuration problems in derived data definition should not block a save call Message-ID: <20100311114230.9116C1C020@svn.vm.castaserver.com> Revision: 22094 Author: bvanhalderen Date: 2010-03-11 12:42:29 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3968: configuration problems in derived data definition should not block a save call Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java Property Changed: ---------------- hippo-ecm/trunk/ hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java hippo-ecm/trunk/frontend/test/pom.xml hippo-ecm/trunk/frontend/test/src/test/ hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java hippo-ecm/trunk/src/site/CMS_logo.png hippo-ecm/trunk/src/site/apt/integration_testing hippo-ecm/trunk/src/site/apt/releasing hippo-ecm/trunk/src/site/hippo_logo.png hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java Property changes on: hippo-ecm/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.html:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog.properties:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$AddDocumentDialog_nl.properties:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin$FolderWorkflowDialog_nl.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.html:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/reorder/ReorderDialog_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/ReorderDialog_nl.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-collection-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/new-folder-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/embedded-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/embedded-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/embedded-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/embedded-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippolog.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/logging.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippolog.cnd:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippolog.cnd:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-logging.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-logging.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-logging.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-logging.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-queries.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-queries.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-queries.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-queries.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows-threepane.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows-threepane.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/hippostd.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/hippostd.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/hippostd.cnd:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/hippostd.cnd:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/namespace-folder.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/namespace-folder.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/namespace-folder.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/namespace-folder.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/repository/src/main/resources/org/hippoecm/repository/shortcuts-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/repository/src/main/resources/shortcuts-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/test/src/main/resources/default-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/default-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/default-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/default-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/default-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/builtin/test/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/test/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/src/main/resources/hippoecm-extension.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/builtin/test/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-depublish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/depublish-shortcut.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-publish-shortcut.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/defaultcontent/repository/src/main/resources/publish-shortcut.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/image-add-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/image-add-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/cms-dashshortcuts-gotolink.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/gotolink/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/hippoecm-extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/src/main/resources/hippoecm-extension.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/gotolink/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/ldap/repository/src/main/resources/hippoldap.cnd ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/ldap/repository/src/main/resources/org/hippoecm/repository/hippoldap.cnd:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/src/main/resources/hippoldap.cnd:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/ldap/repository/src/main/resources/hippoldap.cnd:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/copy-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/delete-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/depublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/edit-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/move-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/rename-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/unplublish-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/skin/src/main/webapp/images/icons/workflow-accept-16.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-accept-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/PublicationRequest.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequest.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicRequestWorkflowImpl.java:17183-17186,17202,17206,17211-17212,17681 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/ScheduledRequestWorkflowImpl.java:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/core-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/core-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/core-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/editing-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/editing-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/extension.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/hippoecm-extension.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostd-addendum-hippostdpubwf.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/resources/namespace-hippostd.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/namespace-hippostdpubwf.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/resources/namespace-hippostd.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-derivatives.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-derivatives.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/reviewedactions-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/versioning-workflows.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/reviewed-action/repository/src/main/resources/versioning-workflows.xml:20604-20690 Property changes on: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/src/main/java/org/hippoecm/repository/VMHippoRepository.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/connector/src/main/java/org/hippoecm/repository/VMHippoRepository.java:20604-20690 Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/engine/src/main/java/org/hippoecm/frontend/wicket1985/res/menu.png:20604-20690 Property changes on: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.html:20604-20690 Property changes on: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/CheckPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/menu/CheckPlugin.java:20604-20690 Property changes on: hippo-ecm/trunk/frontend/test/pom.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/pom.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/pom.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/pom.xml:20604-20690 Property changes on: hippo-ecm/trunk/frontend/test/src/test ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/frontend/engine/src/test:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/frontend/test/src/test:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/frontend/test/src/test:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/src/test:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/frontend/test/src/test:20604-20690 Property changes on: hippo-ecm/trunk/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/package/config/src/main/resources/cms-dashshortcuts.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/package/config/src/main/resources/cms-dashshortcuts-changepassword.xml:20604-20690 Property changes on: hippo-ecm/trunk/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/api/src/main/java/org/hippoecm/repository/HippoRepositoryFactory.java:20604-20690 Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-11 11:41:17 UTC (rev 22093) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/DerivedDataEngine.java 2010-03-11 11:42:29 UTC (rev 22094) @@ -163,6 +163,9 @@ for(Node modified : recomputeSet) { compute(session.getValueFactory(), derivatesFolder, modified); } + } catch(NamespaceException ex) { + // be lenient against confiuration problems + logger.error(ex.getClass().getName()+": "+ex.getMessage(), ex); } catch(ConstraintViolationException ex) { logger.error(ex.getClass().getName()+": "+ex.getMessage(), ex); } finally { Property changes on: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20255-20460,21500,21505 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader21000.java:20604-20690 Property changes on: hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/JcrCompactNodeTypeDefWriter.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/JcrCompactNodeTypeDefWriter.java:20604-20690 Property changes on: hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/Utilities.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/Utilities.java:20604-20690 Property changes on: hippo-ecm/trunk/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/VersionNumber.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/utilities/src/main/java/org/hippoecm/repository/util/VersionNumber.java:20604-20690 Property changes on: hippo-ecm/trunk/src/site/CMS_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/CMS_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/CMS_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/CMS_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/CMS_logo.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/CMS_logo.png:20604-20690 Property changes on: hippo-ecm/trunk/src/site/apt/integration_testing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/integration_testing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/integration_testing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/integration_testing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/integration_testing:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/integration_testing.xml:20604-20690 Property changes on: hippo-ecm/trunk/src/site/apt/releasing ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/xdoc/releasing.xml:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/xdoc/releasing.xml:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/apt/releasing:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/apt/releasing:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/xdoc/releasing.xml:20604-20690 Property changes on: hippo-ecm/trunk/src/site/hippo_logo.png ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/src/site/resources/images/hippo_logo.png:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/src/site/resources/images/hippo_logo.png:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/src/site/hippo_logo.png:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/src/site/hippo_logo.png:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/src/site/resources/images/hippo_logo.png:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ContentItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/DownloadLink.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/DownloadLink.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/Element.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectDialog.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportDialog.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportEngine.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectTree.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTree.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ExportTreeModel.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/JcrDiff.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNamespaceItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NamespaceItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewContentItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewContentItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportNewProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NewProjectItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/NotExportableException.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.html:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/ExportProjectItem.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/ProjectItem.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLExport.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Type.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLItemType.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/Location.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/XMLLocation.java:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/content.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/content.gif:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/namespace.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/namespace.gif:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/tools/projectexport/src/main/java/org/hippoecm/tools/project.gif:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/main/java/org/hippoecm/tools/projectexport/project.gif:20604-20690 Property changes on: hippo-ecm/trunk/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21923,22087 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 + /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20255-20460,21500,21505,21641,21766 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21204 /hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:21923,22087,22093 /hippo-ecm/branches/wicket_upgrade_to_1_4/tools/projectexport/src/test/java/org/hippoecm/tools/projectexport/DevelopmentTest.java:20604-20690 From svn-logs at hippocms.org Thu Mar 11 13:19:35 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 13:24:11 2010 Subject: [HippoRepos-dev] [22095] hippo-ecm: HREPTWO-3967:prepare release Tag-HREPTWO-v2_12_07 Message-ID: <20100311121936.10F341C020@svn.vm.castaserver.com> Revision: 22095 Author: bvanhalderen Date: 2010-03-11 13:19:35 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3967:prepare release Tag-HREPTWO-v2_12_07 Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07-SNAPSHOT + 2.12.07 Builtin common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/common org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07-SNAPSHOT + 2.12.07 Builtin frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/frontend @@ -42,34 +42,34 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Builtin addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07-SNAPSHOT + 2.12.07 Builtin repository addon @@ -28,22 +28,22 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/repository org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07-SNAPSHOT + 2.12.07 Builtin addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/test @@ -45,25 +45,25 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test @@ -81,7 +81,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test @@ -93,109 +93,109 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-repository-upgrade - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-repository-connector - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-repository-modules - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-plugins - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-package-auth - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-package-config - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-gotolink - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07-SNAPSHOT + 2.12.07 CMS admin addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/admin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/admin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/admin @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided @@ -59,13 +59,13 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-connector - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07-SNAPSHOT + 2.12.07 CMS browse addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/browse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/browse + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/browse @@ -45,34 +45,34 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 @@ -80,13 +80,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07-SNAPSHOT + 2.12.07 CMS dashboard addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/dashboard + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/dashboard + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/dashboard @@ -49,44 +49,44 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07-SNAPSHOT + 2.12.07 CMS edit addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/edit + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/edit + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/edit @@ -45,50 +45,50 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 CMS addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07-SNAPSHOT + 2.12.07 CMS root addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/root + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/root + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/root @@ -45,24 +45,24 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.07-SNAPSHOT + 2.12.07 Defaultcontent frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/defaultcontent/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/defaultcontent/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/defaultcontent/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Default content addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.07-SNAPSHOT + 2.12.07 Defaultcontent repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-repository-utilities - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Eavesdrop @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/eavesdrop + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/eavesdrop + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/eavesdrop @@ -49,27 +49,27 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-frontend-plugins - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-connector - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM editor common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/common org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM editor frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/frontend @@ -47,46 +47,46 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Editor addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-editor - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM editor repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/repository @@ -42,22 +42,22 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-utilities - 2.12.07-SNAPSHOT + 2.12.07 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM editor test addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/test @@ -50,60 +50,60 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.07-SNAPSHOT + 2.12.07 Faceted date frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Faceted date addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.07-SNAPSHOT + 2.12.07 Faceted date repository addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/repository org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided @@ -61,19 +61,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.07-SNAPSHOT + 2.12.07 Gallery common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.07-SNAPSHOT + 2.12.07 Gallery frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/frontend @@ -42,39 +42,39 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Gallery Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.07-SNAPSHOT + 2.12.07 Gallery Addon @@ -28,21 +28,21 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/repository org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07-SNAPSHOT + 2.12.07 javax.jcr Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Goto frontend addon @@ -27,16 +27,16 @@ hippo-ecm-addon-gotolink - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gotolink + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gotolink + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gotolink org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided @@ -47,7 +47,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Ldap Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-ldap - 2.12.07-SNAPSHOT + 2.12.07 Ldap Addon Repository @@ -35,13 +35,13 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 provided @@ -53,9 +53,9 @@ - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Addons @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.07-SNAPSHOT + 2.12.07 Reporting frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/frontend @@ -42,13 +42,13 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Reporting addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.07-SNAPSHOT + 2.12.07 Reporting repository addon @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07-SNAPSHOT + 2.12.07 Reviewed action common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/common @@ -42,12 +42,12 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07-SNAPSHOT + 2.12.07 Reviewed action frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/frontend @@ -42,44 +42,44 @@ org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Reviewed action addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07-SNAPSHOT + 2.12.07 Reviewed action repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/repository @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07-SNAPSHOT + 2.12.07 Reviewed action addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/test @@ -51,49 +51,49 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-package-auth - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 test @@ -104,7 +104,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07-SNAPSHOT + 2.12.07 Sample common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07-SNAPSHOT + 2.12.07 Sample frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/frontend @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-sample-common - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Sample addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07-SNAPSHOT + 2.12.07 Sample repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository @@ -43,17 +43,17 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-connector - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-sample-common - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07-SNAPSHOT + 2.12.07 Sample addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/test @@ -51,31 +51,31 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-sample-common - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-sample-frontend - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-sample-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-search - 2.12.07-SNAPSHOT + 2.12.07 Search frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Search Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-standards - 2.12.07-SNAPSHOT + 2.12.07 Standards frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards/frontend @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided @@ -60,13 +60,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Standards addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Versioning frontend addon @@ -27,9 +27,9 @@ hippo-ecm-addon-versioning - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/versioning + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/versioning + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/versioning @@ -41,30 +41,30 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Workflow @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/workflow + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/workflow + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/workflow @@ -49,26 +49,26 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 jar provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Xinha addon @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 Xinha addon frontend plugin @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha-frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha-frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha-frontend @@ -45,19 +45,19 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 hippo @@ -73,20 +73,20 @@ org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07-SNAPSHOT + 2.12.07 YUI frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/yui + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/yui + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/yui @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 API @@ -27,9 +27,9 @@ hippo-ecm-api - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/api + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/api + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/api Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-archetypes - 2.12.07-SNAPSHOT + 2.12.07 Addon archetype @@ -28,9 +28,9 @@ maven-archetype - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Archetypes @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07-SNAPSHOT + 2.12.07 Minimal frontend app @@ -28,21 +28,21 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/application org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-frontend-plugins - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07-SNAPSHOT + 2.12.07 Frontend engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/engine @@ -58,19 +58,19 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-repository-connector - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.apache.wicket Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07-SNAPSHOT + 2.12.07 Frontend plugins @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/plugins + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/plugins + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/plugins @@ -50,22 +50,22 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-tools-projectexport - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-yui - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Frontend @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07-SNAPSHOT + 2.12.07 Frontend engine test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/test @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided @@ -53,19 +53,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM authorisation configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/auth + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/auth + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/auth Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM package configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/config + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/config + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/config Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM EAR package @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07-SNAPSHOT + 2.12.07 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07-SNAPSHOT + 2.12.07 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-frontend-application - 2.12.07-SNAPSHOT + 2.12.07 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM CMS layout @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/layout + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/layout + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/layout Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM package @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package - https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package + https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM package skin @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/skin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/skin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/skin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM package test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/test @@ -48,34 +48,34 @@ org.hippoecm hippo-ecm-package-war - 2.12.07-SNAPSHOT + 2.12.07 war test org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-package-ear - 2.12.07-SNAPSHOT + 2.12.07 ear test org.hippoecm hippo-ecm-quickstart-ear - 2.12.07-SNAPSHOT + 2.12.07 ear test org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM WAR package @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07-SNAPSHOT + 2.12.07 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07-SNAPSHOT + 2.12.07 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-frontend-application - 2.12.07-SNAPSHOT + 2.12.07 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -17,7 +17,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM The core of Hippo ECM, i.e. repository 2, plus an advanced webbased userinterface for content management: CMS, @@ -92,9 +92,9 @@ This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html --> - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM BIN quickstart @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/bin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/bin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/bin org.hippoecm hippo-ecm-quickstart-war - 2.12.07-SNAPSHOT + 2.12.07 war Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM EAR quickstart @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07-SNAPSHOT + 2.12.07 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07-SNAPSHOT + 2.12.07 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-frontend-application - 2.12.07-SNAPSHOT + 2.12.07 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -285,7 +285,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07-SNAPSHOT + 2.12.07 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM quickstart @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart - https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart + https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.07-SNAPSHOT + 2.12.07 Hippo ECM WAR quickstart @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07-SNAPSHOT + 2.12.07 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07-SNAPSHOT + 2.12.07 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07-SNAPSHOT + 2.12.07 war org.hippoecm hippo-ecm-frontend-application - 2.12.07-SNAPSHOT + 2.12.07 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -285,13 +285,13 @@ org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.07-SNAPSHOT + 2.12.07 jar org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07-SNAPSHOT + 2.12.07 jar @@ -346,19 +346,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Minimal repository app @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/application @@ -46,17 +46,17 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-upgrade - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 commons-lang @@ -72,7 +72,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Repository connector @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/connector + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/connector + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/connector @@ -53,7 +53,7 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.slf4j @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Repository engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/engine @@ -69,22 +69,22 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-connector - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-modules - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-utilities - 2.12.07-SNAPSHOT + 2.12.07 org.apache.lucene @@ -99,7 +99,7 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 @@ -112,7 +112,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Repository JCA @@ -27,9 +27,9 @@ hippo-ecm-repository-jca rar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/jca + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/jca + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/jca package @@ -153,182 +153,182 @@ org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-package-auth - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-package-config - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-versioning - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-gotolink - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-editor-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-cms-root - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-workflow - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-frontend-plugins - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Repository modules @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/modules + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/modules + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/modules @@ -51,12 +51,12 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-utilities - 2.12.07-SNAPSHOT + 2.12.07 org.slf4j Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Repository @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Repository test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/test @@ -45,14 +45,14 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test @@ -76,13 +76,13 @@ org.hippoecm hippo-ecm-addon-builtin-repository test - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 test @@ -126,13 +126,13 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-addon-builtin-test - 2.12.07-SNAPSHOT + 2.12.07 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Repository upgrade module @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-repository-utilities - 2.12.07-SNAPSHOT + 2.12.07 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07-SNAPSHOT + 2.12.07 Repository Generic JCR Utilities @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/utilities + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/utilities + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/utilities @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/development-content + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/development-content + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/development-content @@ -45,48 +45,48 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-frontend-plugins - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07-SNAPSHOT + 2.12.07 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/documentation + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/documentation + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/documentation Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07-SNAPSHOT + 2.12.07 hippo-ecm-tools-eclipse @@ -36,9 +36,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/eclipse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/eclipse + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/eclipse Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07-SNAPSHOT + 2.12.07 Tools @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm @@ -28,52 +28,52 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/projectexport + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/projectexport + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/projectexport org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-package-config - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07-SNAPSHOT + 2.12.07 test org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 provided org.hippoecm hippo-ecm-tools-testutils - 2.12.07-SNAPSHOT + 2.12.07 test @@ -90,22 +90,22 @@ org.hippoecm hippo-ecm-api - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-frontend-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-engine - 2.12.07-SNAPSHOT + 2.12.07 org.hippoecm hippo-ecm-repository-utilities - 2.12.07-SNAPSHOT + 2.12.07 com.atomikos Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-11 11:42:29 UTC (rev 22094) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-11 12:19:35 UTC (rev 22095) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07-SNAPSHOT + 2.12.07 Test utilities @@ -29,9 +29,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/testutils + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/testutils + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/testutils From svn-logs at hippocms.org Thu Mar 11 13:36:02 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 13:40:31 2010 Subject: [HippoRepos-dev] [22096] hippo-ecm/tags/Tag-HREPTWO-v2_12_07/: HREPTWO-3967: copy for tag Tag-HREPTWO-v2_12_07 Message-ID: <20100311123602.303BC1C021@svn.vm.castaserver.com> Revision: 22096 Author: bvanhalderen Date: 2010-03-11 13:36:01 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3967: copy for tag Tag-HREPTWO-v2_12_07 Added Paths: ----------- hippo-ecm/tags/Tag-HREPTWO-v2_12_07/ Property changes on: hippo-ecm/tags/Tag-HREPTWO-v2_12_07 ___________________________________________________________________ Added: svn:ignore + *.tmp .classpath .project .settings local.properties nbproject target jpox.log Added: svn:mergeinfo + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 From svn-logs at hippocms.org Thu Mar 11 13:36:12 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Thu Mar 11 13:40:47 2010 Subject: [HippoRepos-dev] [22097] hippo-ecm: HREPTWO-3967:prepare for next development iteration Message-ID: <20100311123613.2E2C31C020@svn.vm.castaserver.com> Revision: 22097 Author: bvanhalderen Date: 2010-03-11 13:36:12 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3967:prepare for next development iteration Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07 + 2.12.08-SNAPSHOT Builtin common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07 + 2.12.08-SNAPSHOT Builtin frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend @@ -42,34 +42,34 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Builtin addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07 + 2.12.08-SNAPSHOT Builtin repository addon @@ -28,22 +28,22 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.07 + 2.12.08-SNAPSHOT Builtin addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/builtin/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test @@ -45,25 +45,25 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test @@ -81,7 +81,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test @@ -93,109 +93,109 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-repository-upgrade - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-repository-connector - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-repository-modules - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-plugins - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-package-auth - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-package-config - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-gotolink - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07 + 2.12.08-SNAPSHOT CMS admin addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/admin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/admin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/admin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided @@ -59,13 +59,13 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07 + 2.12.08-SNAPSHOT CMS browse addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/browse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/browse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/browse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse @@ -45,34 +45,34 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT @@ -80,13 +80,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07 + 2.12.08-SNAPSHOT CMS dashboard addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/dashboard - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/dashboard - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/dashboard + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard @@ -49,44 +49,44 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07 + 2.12.08-SNAPSHOT CMS edit addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/edit - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/edit - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/edit + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit @@ -45,50 +45,50 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT CMS addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.07 + 2.12.08-SNAPSHOT CMS root addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/root - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/root - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/cms/root + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root @@ -45,24 +45,24 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.07 + 2.12.08-SNAPSHOT Defaultcontent frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/defaultcontent/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/defaultcontent/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/defaultcontent/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Default content addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.07 + 2.12.08-SNAPSHOT Defaultcontent repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-repository-utilities - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Eavesdrop @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/eavesdrop - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/eavesdrop - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/eavesdrop + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop @@ -49,27 +49,27 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM editor common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM editor frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend @@ -47,46 +47,46 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Editor addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-editor - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM editor repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository @@ -42,22 +42,22 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.07 + 2.12.08-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM editor test addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/editor/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test @@ -50,60 +50,60 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.07 + 2.12.08-SNAPSHOT Faceted date frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Faceted date addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.07 + 2.12.08-SNAPSHOT Faceted date repository addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/faceteddate/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided @@ -61,19 +61,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.07 + 2.12.08-SNAPSHOT Gallery common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.07 + 2.12.08-SNAPSHOT Gallery frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend @@ -42,39 +42,39 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Gallery Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.07 + 2.12.08-SNAPSHOT Gallery Addon @@ -28,21 +28,21 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gallery/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07 + 2.12.08-SNAPSHOT javax.jcr Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Goto frontend addon @@ -27,16 +27,16 @@ hippo-ecm-addon-gotolink - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gotolink - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gotolink - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/gotolink + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided @@ -47,7 +47,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Ldap Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-ldap - 2.12.07 + 2.12.08-SNAPSHOT Ldap Addon Repository @@ -35,13 +35,13 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT provided @@ -53,9 +53,9 @@ - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/ldap/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Addons @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.07 + 2.12.08-SNAPSHOT Reporting frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend @@ -42,13 +42,13 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Reporting addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.07 + 2.12.08-SNAPSHOT Reporting repository addon @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reporting/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07 + 2.12.08-SNAPSHOT Reviewed action common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common @@ -42,12 +42,12 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07 + 2.12.08-SNAPSHOT Reviewed action frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend @@ -42,44 +42,44 @@ org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Reviewed action addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07 + 2.12.08-SNAPSHOT Reviewed action repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.07 + 2.12.08-SNAPSHOT Reviewed action addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/reviewed-action/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test @@ -51,49 +51,49 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-package-auth - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT test @@ -104,7 +104,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07 + 2.12.08-SNAPSHOT Sample common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07 + 2.12.08-SNAPSHOT Sample frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-sample-common - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Sample addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07 + 2.12.08-SNAPSHOT Sample repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository @@ -43,17 +43,17 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-sample-common - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.07 + 2.12.08-SNAPSHOT Sample addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/sample/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test @@ -51,31 +51,31 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-common - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-frontend - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-search - 2.12.07 + 2.12.08-SNAPSHOT Search frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Search Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/search + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-standards - 2.12.07 + 2.12.08-SNAPSHOT Standards frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided @@ -60,13 +60,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Standards addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/standards + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Versioning frontend addon @@ -27,9 +27,9 @@ hippo-ecm-addon-versioning - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/versioning - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/versioning - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/versioning + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning @@ -41,30 +41,30 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Workflow @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/workflow - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/workflow - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/workflow + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow @@ -49,26 +49,26 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT jar provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Xinha addon @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT Xinha addon frontend plugin @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha-frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha-frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/xinha-frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend @@ -45,19 +45,19 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT hippo @@ -73,20 +73,20 @@ org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.07 + 2.12.08-SNAPSHOT YUI frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/yui - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/yui - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/addon/yui + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT API @@ -27,9 +27,9 @@ hippo-ecm-api - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/api - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/api - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/api + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-archetypes - 2.12.07 + 2.12.08-SNAPSHOT Addon archetype @@ -28,9 +28,9 @@ maven-archetype - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Archetypes @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/archetypes + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07 + 2.12.08-SNAPSHOT Minimal frontend app @@ -28,21 +28,21 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07 + 2.12.08-SNAPSHOT Frontend engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine @@ -58,19 +58,19 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-repository-connector - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.apache.wicket Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07 + 2.12.08-SNAPSHOT Frontend plugins @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/plugins - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/plugins - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/plugins + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins @@ -50,22 +50,22 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-tools-projectexport - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Frontend @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.07 + 2.12.08-SNAPSHOT Frontend engine test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/frontend/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided @@ -53,19 +53,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM authorisation configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/auth - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/auth - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/auth + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM package configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/config - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/config - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/config + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM EAR package @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07 + 2.12.08-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07 + 2.12.08-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.07 + 2.12.08-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM CMS layout @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/layout - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/layout - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/layout + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM package @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package + https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM package skin @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/skin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/skin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/skin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM package test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test @@ -48,34 +48,34 @@ org.hippoecm hippo-ecm-package-war - 2.12.07 + 2.12.08-SNAPSHOT war test org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-package-ear - 2.12.07 + 2.12.08-SNAPSHOT ear test org.hippoecm hippo-ecm-quickstart-ear - 2.12.07 + 2.12.08-SNAPSHOT ear test org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM WAR package @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/package/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07 + 2.12.08-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07 + 2.12.08-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.07 + 2.12.08-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -17,7 +17,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM The core of Hippo ECM, i.e. repository 2, plus an advanced webbased userinterface for content management: CMS, @@ -92,9 +92,9 @@ This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html --> - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM BIN quickstart @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/bin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/bin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/bin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin org.hippoecm hippo-ecm-quickstart-war - 2.12.07 + 2.12.08-SNAPSHOT war Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM EAR quickstart @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07 + 2.12.08-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07 + 2.12.08-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.07 + 2.12.08-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -285,7 +285,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07 + 2.12.08-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM quickstart @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart + https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.07 + 2.12.08-SNAPSHOT Hippo ECM WAR quickstart @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/quickstart/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.07 + 2.12.08-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.07 + 2.12.08-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.07 + 2.12.08-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.07 + 2.12.08-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -285,13 +285,13 @@ org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.07 + 2.12.08-SNAPSHOT jar org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07 + 2.12.08-SNAPSHOT jar @@ -346,19 +346,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Minimal repository app @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application @@ -46,17 +46,17 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-upgrade - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT commons-lang @@ -72,7 +72,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Repository connector @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/connector - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/connector - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/connector + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector @@ -53,7 +53,7 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.slf4j @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Repository engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine @@ -69,22 +69,22 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-modules - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.07 + 2.12.08-SNAPSHOT org.apache.lucene @@ -99,7 +99,7 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT @@ -112,7 +112,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Repository JCA @@ -27,9 +27,9 @@ hippo-ecm-repository-jca rar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/jca - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/jca - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/jca + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca package @@ -153,182 +153,182 @@ org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-package-auth - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-package-config - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-versioning - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-gotolink - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-root - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-edit - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-admin - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-search-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Repository modules @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/modules - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/modules - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/modules + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules @@ -51,12 +51,12 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.07 + 2.12.08-SNAPSHOT org.slf4j Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Repository @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Repository test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test @@ -45,14 +45,14 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test @@ -76,13 +76,13 @@ org.hippoecm hippo-ecm-addon-builtin-repository test - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT test @@ -126,13 +126,13 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-test - 2.12.07 + 2.12.08-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Repository upgrade module @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-repository-utilities - 2.12.07 + 2.12.08-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.07 + 2.12.08-SNAPSHOT Repository Generic JCR Utilities @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/utilities - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/utilities - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/repository/utilities + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/development-content - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/development-content - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/development-content + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content @@ -45,48 +45,48 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-plugins - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-addon-cms-browse - 2.12.07 + 2.12.08-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/documentation - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/documentation - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/documentation + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07 + 2.12.08-SNAPSHOT hippo-ecm-tools-eclipse @@ -36,9 +36,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/eclipse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/eclipse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/eclipse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.07 + 2.12.08-SNAPSHOT Tools @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm @@ -28,52 +28,52 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/projectexport - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/projectexport - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/projectexport + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-package-config - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.07 + 2.12.08-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT provided org.hippoecm hippo-ecm-tools-testutils - 2.12.07 + 2.12.08-SNAPSHOT test @@ -90,22 +90,22 @@ org.hippoecm hippo-ecm-api - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.07 + 2.12.08-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.07 + 2.12.08-SNAPSHOT com.atomikos Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-11 12:36:01 UTC (rev 22096) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-11 12:36:12 UTC (rev 22097) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.07 + 2.12.08-SNAPSHOT Test utilities @@ -29,9 +29,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/testutils - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/testutils - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_07/tools/testutils + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils From helpdesk at onehippo.com Thu Mar 11 14:30:48 2010 From: helpdesk at onehippo.com (JIRA (Dennis Dam)) Date: Thu Mar 11 14:35:20 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3969) Username / password show up as GET request parameters Message-ID: <14405983.2870.1268314248613.JavaMail.jira@jira.vm.castaserver.com> Username / password show up as GET request parameters ----------------------------------------------------- Key: HREPTWO-3969 URL: http://issues.onehippo.com/browse/HREPTWO-3969 Project: Hippo Repository 2 Issue Type: Bug Components: addon-cms-prototype Affects Versions: r2.12.06 Environment: Ubuntu 9.10 , Firefox 3.5, NO Virtual machine Reporter: Dennis Dam Assignee: Stephan Westen I started my laptop this morning, opened Firefox (3.5) and still had a Tab open with the CMS login page in it. Then I noticed that the username and password were in the url as request parameters: http://localhost:8085/cms?username=test-ocw&password=test I did not type this url manually or anything like that. I don't have a clear reproduction path for this issue. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 11 17:08:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Thu Mar 11 17:13:17 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3970) Add optional, default disabled, write test to PingServlet Message-ID: <31558084.3031.1268323728485.JavaMail.jira@jira.vm.castaserver.com> Add optional, default disabled, write test to PingServlet --------------------------------------------------------- Key: HREPTWO-3970 URL: http://issues.onehippo.com/browse/HREPTWO-3970 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Bart van der Schans Assignee: Bart van der Schans Fix For: r2.13.00 The extra write check makes sure the database connection is working and the database is readable and writeable. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 11 17:09:00 2010 From: svn-logs at hippocms.org (bvdschans) Date: Thu Mar 11 17:13:31 2010 Subject: [HippoRepos-dev] [22098] hippo-ecm: HREPTWO-3970: Add optional, default disabled, write test to PingServlet for checking if the persistence is accessible and working Message-ID: <20100311160900.3028D1C020@svn.vm.castaserver.com> Revision: 22098 Author: bvdschans Date: 2010-03-11 17:08:59 +0100 (Thu, 11 Mar 2010) Log Message: ----------- HREPTWO-3970: Add optional, default disabled, write test to PingServlet for checking if the persistence is accessible and working Modified Paths: -------------- hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java Modified: hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java =================================================================== --- hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java 2010-03-11 12:36:12 UTC (rev 22097) +++ hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java 2010-03-11 16:08:59 UTC (rev 22098) @@ -17,8 +17,10 @@ import java.io.IOException; import java.io.PrintWriter; +import java.util.Calendar; import javax.jcr.LoginException; +import javax.jcr.Node; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -30,11 +32,12 @@ import javax.servlet.http.HttpSession; /** - * A simple servlet that can be used to check if the repository is up-n-running. This + * A servlet that can be used to check if the repository is up-and-running. This * is especially useful for load balancer checks. The check does the following steps: * - obtain the repository with the connection string - * - login to the default workspace with the specified username and password - * - try to read the check nod + * - obtain the session with the specified username and password + * - try to read the check node + * - try to write to the repository if enabled * - logout and close session * On success the servlet prints "Ok" and returns a 200 status, on failure, the error is * printed and a 500 (internal server error) status is returned. @@ -56,6 +59,18 @@ check-password admin + + check-node + content/documents + + + write-check-enable + false + + + write-check-node + pingcheck + PingServlet @@ -70,37 +85,33 @@ @SuppressWarnings("unused") private static final String SVN_ID = "$Id$"; - /** The repository address parameter */ + /** Servlet parameters */ private static final String REPOSITORY_ADDRESS_PARAM = "repository-address"; - - /** The username parameter */ private static final String USERNAME_PARAM = "check-username"; - - /** The password parameter */ private static final String PASSWORD_PARAM = "check-password"; - - /** The check node parameter */ private static final String NODE_PARAM = "check-node"; + private static final String WRITE_ENABLE_PARAM = "write-check-enable"; + private static final String WRITE_PATH_PARAM = "write-check-path"; - /** The default repository connection string */ + /** Default values */ private static final String DEFAULT_REPOSITORY_ADDRESS = "rmi://localhost:1099/hipporepository"; - - /** The default user */ private static final String DEFAULT_USERNAME = "admin"; - - /** The default password */ private static final String DEFAULT_PASSWORD = "admin"; - - /** The default check node */ private static final String DEFAULT_NODE = "content/documents"; + private static final String DEFAULT_WRITE_ENABLE = "false"; + private static final String DEFAULT_WRITE_PATH = "pingcheck"; + /** Running config */ private String repositoryLocation; private String username; private String password; private String checkNode; + private String writeTestPath; + private boolean writeTestEnabled = false; - public PingServlet() { - } + /** Local vars */ + private HippoRepository repository; + private Session session; @Override public void init(ServletConfig config) throws ServletException { @@ -108,19 +119,55 @@ repositoryLocation = getParameter(config, REPOSITORY_ADDRESS_PARAM, DEFAULT_REPOSITORY_ADDRESS); username = getParameter(config, USERNAME_PARAM, DEFAULT_USERNAME); password = getParameter(config, PASSWORD_PARAM, DEFAULT_PASSWORD); - checkNode = getParameter(config, NODE_PARAM, DEFAULT_NODE); - if (checkNode.startsWith("/")) { - checkNode = checkNode.substring(1); + checkNode = makePathRelative(getParameter(config, NODE_PARAM, DEFAULT_NODE)); + writeTestPath = makePathRelative(getParameter(config, WRITE_PATH_PARAM, DEFAULT_WRITE_PATH)); + writeTestEnabled = isTrueOrYes(getParameter(config, WRITE_ENABLE_PARAM, DEFAULT_WRITE_ENABLE)); + } + + private String getParameter(ServletConfig config, String paramName, String defaultValue) { + String initValue = config.getInitParameter(paramName); + String contextValue = config.getServletContext().getInitParameter(paramName); + + if (isNotNullAndNotEmpty(initValue)) { + return initValue; + } else if (isNotNullAndNotEmpty(contextValue)) { + return contextValue; + } else { + return defaultValue; } } + + private boolean isNotNullAndNotEmpty(String s) { + if (s != null && s.length() != 0) { + return true; + } + return false; + } + private String makePathRelative(String path) { + while (path.startsWith("/")) { + path = path.substring(1); + } + return path; + } + + private boolean isTrueOrYes(String s) { + if ("true".equalsIgnoreCase(s) || "yes".equalsIgnoreCase(s)) { + return true; + } + return false; + } + @Override protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { int resultStatus = HttpServletResponse.SC_OK; - String resultMessage = "OK - Repository online and accessible"; + String resultMessage = "OK - Repository online and accessible."; + if (writeTestEnabled) { + resultMessage = "OK - Repository online, accessible and writable."; + } Exception exception = null; try { - findNodeInRepository(); + doRepositoryChecks(); } catch (PingException e) { resultStatus = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; resultMessage = e.getMessage(); @@ -142,61 +189,62 @@ closeHttpSession(req); } - @Override - public void destroy() { - super.destroy(); + private void closeHttpSession(HttpServletRequest req) { + if (req != null) { + // close open session + HttpSession httpSession = req.getSession(false); + if (httpSession != null) { + httpSession.invalidate(); + } + } } - /** - * Reads a node from the repository and throws an exception if the repository cannot be found, we cannot obtain - * a session of the configured path cannot be found. - * - * @throws PingException when the repository cannot be opened - */ - private void findNodeInRepository() throws PingException { - HippoRepository hippoRepository; + private void doRepositoryChecks() throws PingException { try { - hippoRepository = HippoRepositoryFactory.getHippoRepository(repositoryLocation); + obtainRepository(); + obtainSession(); + doReadTest(); + doWriteTestIfEnabled(); + } finally { + closeSession(); + } + } + + private void obtainRepository() throws PingException { + try { + repository = null; + repository = HippoRepositoryFactory.getHippoRepository(repositoryLocation); } catch (RepositoryException e) { - String msg = "FAILURE - Problem obtaining repository connection in ping servlet : Is the property" - + " repository-address configured as a context-param?"; + String msg = "FAILURE - Problem obtaining repository connection in ping servlet : Is the property" + " '" + + REPOSITORY_ADDRESS_PARAM + "' configured as an init-param or context-param?"; throw new PingException(msg, e); } - Session session = obtainSession(hippoRepository); - if (session.isLive()) { - lookupNode(session); - } - session.logout(); - } - /** - * Logs in to the provided repository and returns the session - * @param hippoRepository HippoRepository used to obtain a session - * @throws PingException thrown when the provided credentials cannot be used to login to the repository - * @return Session that we logged in to with the provided credentials - */ - private Session obtainSession(HippoRepository hippoRepository) throws PingException { + private void obtainSession() throws PingException { try { - return hippoRepository.login(username, password.toCharArray()); + session = null; + session = repository.login(username, password.toCharArray()); } catch (LoginException e) { String msg = "FAILURE - Wrong credentials for obtaining session from repository in ping servlet : " + "" - + "Are the 'check-username' and check-password configured as an init-param or context-param?"; + + "Are the '" + USERNAME_PARAM + "' and '" + PASSWORD_PARAM + + "' configured as an init-param or context-param?"; throw new PingException(msg, e); } catch (RepositoryException e) { - String msg = "FAILURE - Problem obtaining session from repository in ping servlet : Are the 'check-username' and" - + " check-password configured as an init-param or context-param?"; + String msg = "FAILURE - Problem obtaining session from repository in ping servlet : Are the '" + + USERNAME_PARAM + "' and" + " '" + PASSWORD_PARAM + + "' configured as an init-param or context-param?"; throw new PingException(msg, e); } } - /** - * Use the provided session to lookup a node with the configured path - * - * @param session Session to use for obtaining the node - * @throws PingException Exception thrown when the path for the node cannot be found - */ - private void lookupNode(Session session) throws PingException { + private void closeSession() { + if (session != null && session.isLive()) { + session.logout(); + } + } + + private void doReadTest() throws PingException { String msg; try { if (checkNode.length() == 0) { @@ -214,36 +262,62 @@ } } - /** - * Try to close the session if there is one associated with the request. - * @param req The HttpServletRequest - */ - private void closeHttpSession(HttpServletRequest req) { - if (req != null) { - // close open session - HttpSession httpSession = req.getSession(false); - if (httpSession != null) { - httpSession.invalidate(); + private void doWriteTestIfEnabled() throws PingException { + if (writeTestEnabled) { + doWriteTest(); + } + } + + private void doWriteTest() throws PingException { + try { + Node writePath = getOrCreateWriteNode(); + writePath.setProperty("lastcheck", Calendar.getInstance()); + writePath.save(); + } catch (RepositoryException e) { + String msg = "FAILURE - Error during write test. There could be an issue with the (connection to) the storage."; + throw new PingException(msg, e); + } + } + + private Node getOrCreateWriteNode() throws PingException { + Node path = getOrCreateWritePath(); + String clusterId = getClusterNodeId(); + try { + if (path.hasNode(clusterId)) { + return path.getNode(clusterId); + } else { + Node node = path.addNode(clusterId); + session.save(); + return node; } + } catch (RepositoryException e) { + String msg = "FAILURE - Could not obtain the write test node '" + writeTestPath + "/" + clusterId + "'."; + throw new PingException(msg, e); } } - /** - * Helper method for easily finding init parameters with a default value - * @param config the servlet configuration - * @param paramName the name of the parameter - * @param defaultValue the default - * @return the value of the parameter or the defaultValue if not set - */ - private String getParameter(ServletConfig config, String paramName, String defaultValue) { - String value = config.getInitParameter(paramName); - if (value == null || value.equals("")) { - value = config.getServletContext().getInitParameter(paramName); + private Node getOrCreateWritePath() throws PingException { + Node path; + try { + if (session.getRootNode().hasNode(writeTestPath)) { + path = session.getRootNode().getNode(writeTestPath); + } else { + path = session.getRootNode().addNode(writeTestPath); + session.save(); + } + return path; + } catch (RepositoryException e) { + String msg = "FAILURE - Could not obtain the write path node '" + writeTestPath + "'."; + throw new PingException(msg, e); } - if (value == null || value.equals("")) { - value = defaultValue; + } + + private String getClusterNodeId() { + String id = System.getProperty("org.apache.jackrabbit.core.cluster.node_id"); + if (id == null || id.length() == 0) { + return "default"; } - return value; + return id; } /** From helpdesk at onehippo.com Fri Mar 12 10:56:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 12 11:01:20 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3971) Rename activities logging order and completeness of information Message-ID: <11975437.3248.1268387808549.JavaMail.jira@jira.vm.castaserver.com> Rename activities logging order and completeness of information --------------------------------------------------------------- Key: HREPTWO-3971 URL: http://issues.onehippo.com/browse/HREPTWO-3971 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07 Environment: FFx 3.6, cmstest.onehipo.com Reporter: Sylvain P?lissier STEPS: ------ Create a document of type Article, then click Done and you get the following three messages in the History panel (aka Activity log): ago, finished drafting out "" ago, started a draft version of "" ago, added "" (...) ACTUAL: ------- Now rename the document in question, and get the following in the History panel: ago, renamed "" ago, finished drafting out "" ago, started a draft version of "" ago, finished drafting out "" ago, started a draft version of "" ago, added "" (...) EXPECTED: --------- I can understand (imagine) why it is like this, but I always find the sequence rather confusing. A better logic, imo, would result in: ago, finished drafting out "" ago, started a draft version of "" ago, renamed "" ago, finished drafting out "" ago, started a draft version of "" ago, added "" (...) This way it becomes clearer that is now . Ideally: ago, renamed "" to "" Alternatively: Just renaming an existing file gives the sequence: ago, renamed "" ago, renamed "" ago, renamed "" ago, renamed "" Question, what is the current name of the file: impossible to guess. So this information is not very rich. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 12 14:56:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 12 15:01:20 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3972) Replication - numberOfRetries not exactly fulfilled Message-ID: <8920783.3559.1268402208776.JavaMail.jira@jira.vm.castaserver.com> Replication - numberOfRetries not exactly fulfilled --------------------------------------------------- Key: HREPTWO-3972 URL: http://issues.onehippo.com/browse/HREPTWO-3972 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07 Environment: n/a Reporter: Sylvain P?lissier Attachments: numberOfRetries .log The Master tries to obtain a session to the RMI host:port that is defined int he web.xml file of the Slave. If for some reason, such as a typo in the above definition, then it is supposed to try again after retryDelay milliseconds as many times as the value of numberOfRetries. I have forced that the Master could not locate the host of the Slave (Master and Slave are running on two different hosts but in web.xml of the Master, is set to localhost. I have attached the console output, because although numberOfRetries is set to 5 (default value), it does actually try 1 to 6 times (problem 1), and continues after the sixth retry has failed. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 12 14:56:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 12 15:01:23 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3972) Replication - numberOfRetries not exactly fulfilled In-Reply-To: <8920783.3559.1268402208776.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <11368973.3561.1268402208819.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3972?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3972: --------------------------------------- Attachment: numberOfRetries .log > Replication - numberOfRetries not exactly fulfilled > --------------------------------------------------- > > Key: HREPTWO-3972 > URL: http://issues.onehippo.com/browse/HREPTWO-3972 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: n/a > Reporter: Sylvain P?lissier > Attachments: numberOfRetries .log > > > The Master tries to obtain a session to the RMI host:port that is defined int he web.xml file of the Slave. If for some reason, such as a typo in the above definition, then it is supposed to try again after retryDelay milliseconds as many times as the value of numberOfRetries. > I have forced that the Master could not locate the host of the Slave (Master and Slave are running on two different hosts but in web.xml of the Master, is set to localhost. > I have attached the console output, because although numberOfRetries is set to 5 (default value), it does actually try 1 to 6 times (problem 1), and continues after the sixth retry has failed. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 12 15:14:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 12 15:19:20 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3972) Replication - numberOfRetries not exactly fulfilled In-Reply-To: <8920783.3559.1268402208776.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8622284.3591.1268403288529.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3972?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3972: ----------------------------------------- Fix Version/s: r2.13.00 Priority: Low (was: Normal) > Replication - numberOfRetries not exactly fulfilled > --------------------------------------------------- > > Key: HREPTWO-3972 > URL: http://issues.onehippo.com/browse/HREPTWO-3972 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: n/a > Reporter: Sylvain P?lissier > Priority: Low > Fix For: r2.13.00 > > Attachments: numberOfRetries .log > > > The Master tries to obtain a session to the RMI host:port that is defined int he web.xml file of the Slave. If for some reason, such as a typo in the above definition, then it is supposed to try again after retryDelay milliseconds as many times as the value of numberOfRetries. > I have forced that the Master could not locate the host of the Slave (Master and Slave are running on two different hosts but in web.xml of the Master, is set to localhost. > I have attached the console output, because although numberOfRetries is set to 5 (default value), it does actually try 1 to 6 times (problem 1), and continues after the sixth retry has failed. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Sun Mar 14 08:21:21 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Sun Mar 14 08:26:02 2010 Subject: [HippoRepos-dev] [22125] hippo-ecm/trunk: HREPTWO-3953: reverting commits 22052, 22053 and 22067; they break the console application Message-ID: <20100314072121.7A7281C020@svn.vm.castaserver.com> Revision: 22125 Author: bvanhalderen Date: 2010-03-14 08:21:20 +0100 (Sun, 14 Mar 2010) Log Message: ----------- HREPTWO-3953: reverting commits 22052, 22053 and 22067; they break the console application Modified Paths: -------------- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml Added Paths: ----------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java Removed Paths: ------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/ Modified: hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html 2010-03-14 07:21:20 UTC (rev 22125) @@ -19,9 +19,9 @@
    bar -
    +
    -
    +
    Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-14 07:21:20 UTC (rev 22125) @@ -17,10 +17,8 @@
    -
    -
    workflow here
    -
    feedback here
    -
    +
    workflow here
    +
    feedback here
    Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -107,7 +107,7 @@ wfConfig = new JavaPluginConfig(); } wfSettings = new WireframeSettings(wfConfig); - UnitSettings topSettings = wfSettings.getUnit("top"); + UnitSettings topSettings = wfSettings.getUnitSettingsByPosition("top"); topHeight = topSettings.getHeight(); add(new WireframeBehavior(wfSettings)); } @@ -116,7 +116,7 @@ public void render(PluginRequestTarget target) { super.render(target); boolean hasMessage = feedback.anyMessage(); - UnitSettings topSettings = wfSettings.getUnit("top"); + UnitSettings topSettings = wfSettings.getUnitSettingsByPosition("top"); boolean updateTop = false; if (hasMessage && !feedbackShown) { topSettings.setHeight(Integer.valueOf( @@ -129,7 +129,7 @@ updateTop = true; } if (updateTop && isVisibleInHierarchy() && target != null) { - String topId = topSettings.getId().getElementId(); + String topId = topSettings.getElementId(); target.appendJavascript("YAHOO.hippo.LayoutManager.findLayoutUnit(YAHOO.util.Dom.get('" + topId + "')).set('height', " + topSettings.getHeight() + ");"); target.addComponent(feedback); Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-14 07:21:20 UTC (rev 22125) @@ -33,7 +33,7 @@
    -
    +
    Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -15,6 +15,7 @@ */ package org.hippoecm.frontend.plugins.cms.root; +import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.PluginRequestTarget; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; @@ -26,6 +27,7 @@ import org.hippoecm.frontend.plugins.yui.layout.PageLayoutBehavior; import org.hippoecm.frontend.plugins.yui.layout.PageLayoutSettings; import org.hippoecm.frontend.plugins.yui.layout.UnitBehavior; +import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; @@ -46,9 +48,7 @@ add(new Pinger("pinger")); add(new LogoutLink("logout")); - PageLayoutSettings plSettings = new PageLayoutSettings(); - plSettings.setHeaderHeight(50); - // TODO: update settings from config + PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("layout.page")); add(new PageLayoutBehavior(plSettings)); add(new AjaxIndicatorBehavior()); @@ -68,10 +68,18 @@ add(new BrowserSpecificStylesheetsBehavior(configurations)); get("tabs").add(new WireframeBehavior(new WireframeSettings(config.getPluginConfig("layout.wireframe")))); - get("tabs:panel-container").add(new UnitBehavior("center")); - get("tabs:tabs-container").add(new UnitBehavior("left")); + get("tabs:panel-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.panel")))); + get("tabs:tabs-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.tabs")))); } + static UnitSettings createSettings(IPluginConfig config) { + if (config.containsKey("options")) { + return new UnitSettings(config.getString("position"), new ValueMap(config.getString("options"))); + } else { + return new UnitSettings(config); + } + } + @Override public void render(PluginRequestTarget target) { if (!rendered) { Modified: hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml =================================================================== --- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-14 07:21:20 UTC (rev 22125) @@ -168,6 +168,10 @@ template-type-wrapper + + center + right + Modified: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -320,7 +320,8 @@ // YUCK! WebAppBehavior yuiWebApp = new WebAppBehavior(new WebAppSettings()); home.add(yuiWebApp); - home.add(new PageLayoutBehavior(new PageLayoutSettings())); + context.registerService(yuiWebApp, "service.behavior.yui"); + home.add(new PageLayoutBehavior(new PageLayoutSettings(new JavaPluginConfig()))); Node templateTypeNode = session.getRootNode().getNode("hippo:namespaces/test/edited"); JcrNodeModel nodeModel = new JcrNodeModel(templateTypeNode); @@ -356,7 +357,8 @@ // YUCK! WebAppBehavior yuiWebApp = new WebAppBehavior(new WebAppSettings()); home.add(yuiWebApp); - home.add(new PageLayoutBehavior(new PageLayoutSettings())); + context.registerService(yuiWebApp, "service.behavior.yui"); + home.add(new PageLayoutBehavior(new PageLayoutSettings(new JavaPluginConfig()))); Node templateTypeNode = session.getRootNode().getNode("hippo:namespaces/test/edited"); JcrNodeModel nodeModel = new JcrNodeModel(templateTypeNode); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -20,7 +20,6 @@ import java.util.Map; import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.IHeaderResponse; @@ -92,7 +91,7 @@ if (getSettings() instanceof YuiObject) { return ((YuiObject) getSettings()).toScript(); } else if (getSettings() != null) { - return JSONObject.fromObject(getSettings(), getJsonConfig()).toString(); + return JSONObject.fromObject(getSettings()).toString(); } else { return "null"; } @@ -122,8 +121,4 @@ return configuration; } - public JsonConfig getJsonConfig() { - return new JsonConfig(); - } - } Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java (from rev 22051, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -0,0 +1,80 @@ +/* + * Copyright 2009 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.yui.javascript; + +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.wicket.IClusterable; + +/** + * The YuiId allows for transparent element id resolution, without having to worry about id clashes on the client. + * + * The idea is really simple. A YuiId consists of an id value, and an optional parentId value. If the parentId is set, + * the YuiId will return an elementId like 'parentId:id', else it will only return the local id. + * + * The id value corresponds to an element in a {@link org.apache.wicket.Component}'s html file through the attribute + * yui:id, the parent id is a normal id-attribute, normally generated by Wicket and added to the YuiId once it's known. + * + * The YAHOO.hippo.LayoutManager module uses YAHOO.hippo.Dom.resolveElement(id) to resolve elements by their YuiId. + * For more info see: + * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/hippodom/hippodom.js + */ +public class YuiId implements IClusterable { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + String id; + String parentId; + + public YuiId(String id) { + this.id = id; + } + + public String getElementId() { + if (parentId != null && !"".equals(parentId)) { + if (id != null && !"".equals(id)) { + return parentId + ":" + id; + } + } else { + return id; + } + return ""; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", id) + .append("parentId", parentId).toString(); + } +} Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java (from rev 22051, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -0,0 +1,59 @@ +/* + * Copyright 2009 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.yui.javascript; + +import org.hippoecm.frontend.plugin.config.IPluginConfig; + +public class YuiIdSetting extends Setting { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + public YuiIdSetting(String javascriptKey) { + super(javascriptKey, null); + } + + public YuiIdSetting(String javascriptKey, YuiId defaultValue) { + super(javascriptKey, defaultValue); + } + + public YuiId newValue() { + if (defaultValue != null) { + YuiId id = new YuiId(defaultValue.id); + if (defaultValue.parentId != null) { + id.setParentId(defaultValue.parentId); + } + return id; + } else { + return null; + } + } + + @Override + protected YuiId getValueFromConfig(IPluginConfig config, YuiObject settings) { + return new YuiId(config.getString(configKey)); + } + + public void setFromString(String value, YuiObject settings) { + set(new YuiId(value), settings); + } + + public String getScriptValue(YuiId value) { + return StringSetting.escapeString(value.getElementId()); + } + +} Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -16,12 +16,13 @@ package org.hippoecm.frontend.plugins.yui.javascript; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import org.apache.wicket.IClusterable; import org.apache.wicket.util.value.IValueMap; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.util.PluginConfigMapper; /** * Base class for passing configuration to a YUI component on the client. @@ -38,9 +39,11 @@ private YuiType type; private Map, Object> settings; + private List listeners; public YuiObject(YuiType type) { this.type = type; + listeners = new LinkedList(); settings = new HashMap, Object>(); for (Setting setting : type.getProperties()) { this.settings.put(setting, setting.newValue()); @@ -75,8 +78,31 @@ void set(Setting key, Object value) { settings.put(key, value); + notifyListeners(); } + public void addListener(IYuiListener listener) { + listeners.add(listener); + } + + public void removeListener(IYuiListener listener) { + listeners.remove(listener); + } + + protected void notifyListeners() { + if (listeners.size() > 0) { + IYuiListener.Event event = new IYuiListener.Event() { + @Override + public YuiObject getSource() { + return YuiObject.this; + } + }; + for (IYuiListener listener : listeners) { + listener.onEvent(event); + } + } + } + public String toScript() { StringBuilder sb = new StringBuilder(); sb.append('{'); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -16,6 +16,7 @@ package org.hippoecm.frontend.plugins.yui.layout; import org.apache.wicket.behavior.IBehavior; +import org.hippoecm.frontend.plugins.yui.javascript.YuiId; /** * Base wireframe interface, allows wireframes that are linked to their parent to register Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -15,14 +15,15 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import net.sf.json.JsonConfig; - import org.apache.wicket.Component; +import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.util.template.PackagedTextTemplate; -import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; +import org.hippoecm.frontend.plugins.yui.AbstractYuiAjaxBehavior; import org.hippoecm.frontend.plugins.yui.HippoNamespace; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.HippoTextTemplate; +import org.hippoecm.frontend.plugins.yui.javascript.YuiId; +import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; /** * Special purpose {@link WireframeBehavior} that automatically binds itself to the document body and creates a @@ -37,7 +38,7 @@ * * @see WireframeBehavior */ -public class PageLayoutBehavior extends AbstractYuiBehavior implements IWireframeService { +public class PageLayoutBehavior extends AbstractYuiAjaxBehavior implements IWireframeService { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -49,6 +50,7 @@ private HippoTextTemplate template; public PageLayoutBehavior(final PageLayoutSettings settings) { + super(settings); this.settings = settings; template = new HippoTextTemplate(INIT_PAGE, "YAHOO.hippo.GridsRootWireframe") { private static final long serialVersionUID = 1L; @@ -59,16 +61,9 @@ } @Override - public PageLayoutSettings getSettings() { + public YuiObject getSettings() { return settings; } - - @Override - public JsonConfig getJsonConfig() { - JsonConfig jsonConfig = new JsonConfig(); - jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); - return jsonConfig; - } }; } @@ -80,6 +75,10 @@ } @Override + protected void respond(AjaxRequestTarget target) { + } + + @Override public void detach(Component component) { template.detach(); } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -15,145 +15,58 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import java.io.Serializable; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugins.yui.javascript.AjaxSettings; +import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; +import org.hippoecm.frontend.plugins.yui.javascript.IntSetting; +import org.hippoecm.frontend.plugins.yui.javascript.StringSetting; +import org.hippoecm.frontend.plugins.yui.javascript.YuiId; +import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; +import org.hippoecm.frontend.plugins.yui.javascript.YuiType; - -public class PageLayoutSettings implements Serializable { +public class PageLayoutSettings extends AjaxSettings { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private YuiId rootId = new YuiId("doc3"); + private static final YuiIdSetting ROOT_ID = new YuiIdSetting("rootId", new YuiId("doc3")); - private int headerHeight; - private int footerHeight; - private int leftWidth; - private int rightWidth; + private static final IntSetting HEADER_HEIGHT = new IntSetting("headerHeight"); + private static final IntSetting FOOTER_HEIGHT = new IntSetting("footerHeight"); + private static final IntSetting LEFT_WIDTH = new IntSetting("leftWidth"); + private static final IntSetting RIGHT_WIDTH = new IntSetting("rightWidth"); - private String headerGutter = "0px 0px 0px 0px"; - private String bodyGutter = "0px 0px 0px 0px"; - private String leftGutter = "0px 0px 0px 0px"; - private String rightGutter = "0px 0px 0px 0px"; + private static final StringSetting HEADER_GUTTER = new StringSetting("headerGutter"); + private static final StringSetting BODY_GUTTER = new StringSetting("bodyGutter"); + private static final StringSetting FOOTER_GUTTER = new StringSetting("footerGutter"); + private static final StringSetting LEFT_GUTTER = new StringSetting("leftGutter"); + private static final StringSetting RIGHT_GUTTER = new StringSetting("rightGutter"); - private boolean bodyScroll; - private boolean headerScroll; - private boolean footerScroll; - private boolean leftScroll; - private boolean rightScroll; + private static final BooleanSetting BODY_SCROLL = new BooleanSetting("bodyScroll"); + private static final BooleanSetting HEADER_SCROLL = new BooleanSetting("headerScroll"); + private static final BooleanSetting FOOTER_SCROLL = new BooleanSetting("footerScroll"); + private static final BooleanSetting LEFT_SCROLL = new BooleanSetting("leftScroll"); + private static final BooleanSetting RIGHT_SCROLL = new BooleanSetting("rightScroll"); + + private static final BooleanSetting HEADER_RESIZE = new BooleanSetting("headerResize"); + private static final BooleanSetting FOOTER_RESIZE = new BooleanSetting("footerResize"); + private static final BooleanSetting LEFT_RESIZE = new BooleanSetting("leftResize"); + private static final BooleanSetting RIGHT_RESIZE = new BooleanSetting("rightResize"); + - private boolean headerResize; - private boolean footerResize; - private boolean leftResize; - private boolean rightResize; + protected static final YuiType TYPE = new YuiType(AjaxSettings.TYPE, ROOT_ID, + HEADER_HEIGHT, FOOTER_HEIGHT, LEFT_WIDTH, RIGHT_WIDTH, + HEADER_GUTTER, BODY_GUTTER, FOOTER_GUTTER, LEFT_GUTTER, RIGHT_GUTTER, + HEADER_SCROLL, FOOTER_SCROLL, LEFT_SCROLL, RIGHT_SCROLL, BODY_SCROLL, + HEADER_RESIZE, FOOTER_RESIZE, LEFT_RESIZE, RIGHT_RESIZE); - public void setRootId(YuiId rootId) { - this.rootId = rootId; + public PageLayoutSettings(IPluginConfig config) { + super(TYPE, config); } + public YuiId getRootId() { - return rootId; + return ROOT_ID.get(this); } - public void setHeaderHeight(int headerHeight) { - this.headerHeight = headerHeight; - } - public int getHeaderHeight() { - return headerHeight; - } - public void setFooterHeight(int footerHeight) { - this.footerHeight = footerHeight; - } - public int getFooterHeight() { - return footerHeight; - } - public void setLeftWidth(int leftWidth) { - this.leftWidth = leftWidth; - } - public int getLeftWidth() { - return leftWidth; - } - public void setRightWidth(int rightWidth) { - this.rightWidth = rightWidth; - } - public int getRightWidth() { - return rightWidth; - } - public void setHeaderGutter(String headerGutter) { - this.headerGutter = headerGutter; - } - public String getHeaderGutter() { - return headerGutter; - } - public void setBodyGutter(String bodyGutter) { - this.bodyGutter = bodyGutter; - } - public String getBodyGutter() { - return bodyGutter; - } - public void setLeftGutter(String leftGutter) { - this.leftGutter = leftGutter; - } - public String getLeftGutter() { - return leftGutter; - } - public void setRightGutter(String rightGutter) { - this.rightGutter = rightGutter; - } - public String getRightGutter() { - return rightGutter; - } - public void setBodyScroll(boolean bodyScroll) { - this.bodyScroll = bodyScroll; - } - public boolean isBodyScroll() { - return bodyScroll; - } - public void setHeaderScroll(boolean headerScroll) { - this.headerScroll = headerScroll; - } - public boolean isHeaderScroll() { - return headerScroll; - } - public void setFooterScroll(boolean footerScroll) { - this.footerScroll = footerScroll; - } - public boolean isFooterScroll() { - return footerScroll; - } - public void setLeftScroll(boolean leftScroll) { - this.leftScroll = leftScroll; - } - public boolean isLeftScroll() { - return leftScroll; - } - public void setRightScroll(boolean rightScroll) { - this.rightScroll = rightScroll; - } - public boolean isRightScroll() { - return rightScroll; - } - public void setHeaderResize(boolean headerResize) { - this.headerResize = headerResize; - } - public boolean isHeaderResize() { - return headerResize; - } - public void setFooterResize(boolean footerResize) { - this.footerResize = footerResize; - } - public boolean isFooterResize() { - return footerResize; - } - public void setLeftResize(boolean leftResize) { - this.leftResize = leftResize; - } - public boolean isLeftResize() { - return leftResize; - } - public void setRightResize(boolean rightResize) { - this.rightResize = rightResize; - } - public boolean isRightResize() { - return rightResize; - } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -16,6 +16,7 @@ package org.hippoecm.frontend.plugins.yui.layout; +import java.util.List; import java.util.Map; import org.apache.commons.lang.builder.HashCodeBuilder; @@ -43,15 +44,16 @@ static final Logger log = LoggerFactory.getLogger(UnitBehavior.class); - private String position; + private UnitSettings settings; - public UnitBehavior(String position) { - this.position = position; + public UnitBehavior(UnitSettings settings) { + this.settings = settings; } @Override public void bind(final Component component) { super.bind(component); + settings.setMarkupId(component.getMarkupId(true)); // re-render complete wireframe during the render phase AjaxRequestTarget target = AjaxRequestTarget.get(); @@ -64,7 +66,7 @@ MarkupContainer parent = component.getParent(); boolean found = false; while (parent != null) { - for (IBehavior behavior : parent.getBehaviors()) { + for (IBehavior behavior : (List) parent.getBehaviors()) { if (behavior instanceof IWireframeService) { target.addComponent(parent); found = true; @@ -87,8 +89,8 @@ } } - public String getPosition() { - return position; + public UnitSettings getSettings() { + return settings; } @Override Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -16,14 +16,17 @@ package org.hippoecm.frontend.plugins.yui.layout; import org.apache.wicket.behavior.IBehavior; +import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.plugin.IPlugin; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.Plugin; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugins.yui.YuiPluginHelper; import org.hippoecm.frontend.service.IBehaviorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + /** * Special purpose {@link Plugin} that allows us to add the behavior through configuration instead of adding it * in code to our component. @@ -48,6 +51,14 @@ } public IBehavior getBehavior() { - return new UnitBehavior(getPluginConfig().getString("position")); + return new UnitBehavior(createSettings(YuiPluginHelper.getConfig(getPluginConfig()))); } + + static UnitSettings createSettings(IPluginConfig config) { + if (config.containsKey("options")) { + return new UnitSettings(config.getString("position"), new ValueMap(config.getString("options"))); + } else { + return new UnitSettings(config); + } + } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -15,11 +15,15 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import java.io.Serializable; - import org.apache.wicket.util.value.IValueMap; -import org.hippoecm.frontend.util.MappingException; -import org.hippoecm.frontend.util.PluginConfigMapper; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; +import org.hippoecm.frontend.plugins.yui.javascript.IntSetting; +import org.hippoecm.frontend.plugins.yui.javascript.StringSetting; +import org.hippoecm.frontend.plugins.yui.javascript.YuiId; +import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; +import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; +import org.hippoecm.frontend.plugins.yui.javascript.YuiType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,9 +38,7 @@ * ID: a {@link YuiId} value representing the unit's root element. * *
  • - * BODY: a {@link YuiId} value representing the unit's body element. The body should not be configured when the unit - * wraps a {@link Component} with a {@link UnitBehavior}. When neither body nor UnitBehavior is present, a body - * element will be generated. + * BODY: a {@link YuiId} value representing the unit's body element. *
    • *
  • * WIDTH: width (in pixels) that the unit will take up in the wireframe (only applies to left and right units and @@ -73,7 +75,7 @@ *
    • * */ -public class UnitSettings implements Serializable { +public class UnitSettings extends YuiObject { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -81,119 +83,155 @@ static final Logger log = LoggerFactory.getLogger(UnitSettings.class); - private String position = "center"; - private YuiId id = new YuiId(""); - private YuiId body = new YuiId(""); + private static final StringSetting POSITION = new StringSetting("position"); + private static final YuiIdSetting ID = new YuiIdSetting("id"); + private static final YuiIdSetting BODY = new YuiIdSetting("body"); - private String width; - private String height; + private static final StringSetting WIDTH = new StringSetting("width"); + private static final StringSetting HEIGHT = new StringSetting("height"); - private String minWidth; - private String minHeight; + private static final StringSetting MIN_WIDTH = new StringSetting("minWidth"); + private static final StringSetting MIN_HEIGHT = new StringSetting("minHeight"); - private String gutter = "0px 0px 0px 0px"; - private boolean scroll; - private boolean resize; - private boolean useShim; - + private static final StringSetting GUTTER = new StringSetting("gutter"); + private static final BooleanSetting SCROLL = new BooleanSetting("scroll"); + private static final BooleanSetting RESIZE = new BooleanSetting("resize"); + private static final BooleanSetting USE_SHIM = new BooleanSetting("useShim"); + //TODO: does this still work? - //private static final IntSetting Z_INDEX = new IntSetting("zindex"); + private static final IntSetting Z_INDEX = new IntSetting("zindex"); + protected final static YuiType TYPE = new YuiType(POSITION, ID, BODY, WIDTH, HEIGHT, MIN_WIDTH, MIN_HEIGHT, GUTTER, + SCROLL, RESIZE, Z_INDEX, USE_SHIM); + public static final String TOP = "top"; public static final String RIGHT = "right"; public static final String BOTTOM = "bottom"; public static final String LEFT = "left"; public static final String CENTER = "center"; - public UnitSettings(String position, IValueMap config) { - this.position = position; - if (config != null) { - try { - PluginConfigMapper.populate(this, config); - } catch (MappingException e) { - throw new RuntimeException("invalid configuration"); - } - id.setId(config.getString("id")); - if (config.containsKey("body")) { - body.setId(config.getString("body")); - } - } + private String wrapperId; + private String markupId; + + public UnitSettings(String position) { + super(TYPE); + POSITION.set(position, this); } - public String getPosition() { - return position; + public UnitSettings(String position, IValueMap options) { + super(TYPE); + POSITION.set(position, this); + updateValues(options); } - public void setWidth(String width) { - this.width = width; + public UnitSettings(IPluginConfig config) { + super(TYPE, config); } + public void setPosition(String position, YuiObject settings) { + POSITION.set(position, settings); + } + + public String getPosition() { + return POSITION.get(this); + } + public String getWidth() { - return width; + return WIDTH.get(this); } - public void setHeight(String height) { - this.height = height; + public void setWidth(String width) { + WIDTH.set(width, this); } public String getHeight() { - return height; + return HEIGHT.get(this); } - public void setMinWidth(String minWidth) { - this.minWidth = minWidth; + public void setHeight(String height) { + HEIGHT.set(height, this); } public String getMinWidth() { - return minWidth; + return MIN_WIDTH.get(this); } - public void setMinHeight(String minHeight) { - this.minHeight = minHeight; + public void setMinWidth(String minWidth) { + MIN_WIDTH.set(minWidth, this); } public String getMinHeight() { - return minHeight; + return MIN_HEIGHT.get(this); } - public void setGutter(String gutter) { - this.gutter = gutter; + public void setMinHeight(String minHeight) { + MIN_HEIGHT.set(minHeight, this); } - public String getGutter() { - return gutter; + public String getElementId() { + return ID.get(this).getElementId(); } - public void setScroll(boolean scroll) { - this.scroll = scroll; + public String getWrapperId() { + return wrapperId; } - public boolean isScroll() { - return scroll; + public void setWrapperId(String id) { + wrapperId = id; + notifyListeners(); } - public void setResize(boolean resize) { - this.resize = resize; + public String getMarkupId() { + return markupId; } - public boolean isResize() { - return resize; + public String getBody() { + return BODY.getScriptValue(BODY.get(this)); } - public void setUseShim(boolean useShim) { - this.useShim = useShim; + public void setMarkupId(String markupId) { + this.markupId = markupId; + if (wrapperId != null) { + if (BODY.get(this) != null) { + BODY.get(this).setId(markupId); + } + } + notifyListeners(); } - public boolean isUseShim() { - return useShim; + @Override + public boolean isValid() { + return ID.get(this) != null; } - public YuiId getBody() { - return body; - } + public void setParentMarkupId(String parentMarkupId) { + if (wrapperId != null) { + YuiId id = ID.get(this); + if (id == null) { + ID.set(new YuiId(wrapperId), this); + id = ID.get(this); + } else { + id.setId(wrapperId); + } + id.setParentId(parentMarkupId); - public YuiId getId() { - return id; + YuiId body = BODY.get(this); + if (body == null) { + BODY.set(new YuiId(markupId), this); + } else { + body.setId(markupId); + body.setParentId(null); + } + } else if (ID.get(this) != null) { + YuiId id = ID.get(this); + id.setParentId(parentMarkupId); + + YuiId body = BODY.get(this); + if (body != null) { + body.setParentId(parentMarkupId); + } + } + notifyListeners(); } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -15,19 +15,19 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import java.io.Serializable; - -import net.sf.json.JsonConfig; - import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Component.IVisitor; +import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.util.template.PackagedTextTemplate; import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; import org.hippoecm.frontend.plugins.yui.HippoNamespace; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.HippoTextTemplate; +import org.hippoecm.frontend.plugins.yui.javascript.IYuiListener; +import org.hippoecm.frontend.plugins.yui.javascript.YuiId; +import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; import org.hippoecm.frontend.service.render.RenderService; /** @@ -128,7 +128,7 @@ *

    * * @see org.hippoecm.frontend.plugins.yui.layout.WireframeSettings - * @see org.hippoecm.frontend.plugins.yui.layout.YuiId + * @see org.hippoecm.frontend.plugins.yui.javascript.YuiId */ public class WireframeBehavior extends AbstractYuiBehavior implements IWireframeService { @@ -146,26 +146,32 @@ public WireframeBehavior(final WireframeSettings settings) { this.settings = settings; + this.settings.addListener(new IYuiListener() { + private static final long serialVersionUID = 1L; + public void onEvent(Event event) { + if (component != null) { + AjaxRequestTarget target = AjaxRequestTarget.get(); + if (target != null) { + target.addComponent(component); + } + } + } + + }); + template = new HippoTextTemplate(behaviorJs, settings.getClientClassName()) { private static final long serialVersionUID = 1L; @Override public String getId() { - return settings.getRootId().getElementId(); + return settings.getRootElementId().getElementId(); } @Override - public Serializable getSettings() { + public YuiObject getSettings() { return settings; } - - @Override - public JsonConfig getJsonConfig() { - JsonConfig jsonConfig = new JsonConfig(); - jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); - return jsonConfig; - } }; } @@ -173,7 +179,7 @@ * Implements IWireframeService */ public YuiId getParentId() { - return settings.getRootId(); + return settings.getRootElementId(); } @Override @@ -223,23 +229,13 @@ //Visit child components in order to find components that contain a {@link UnitBehavior}. If another wireframe //or unit is encountered, stop going deeper. MarkupContainer cont = (MarkupContainer) component; - cont.visitChildren(new IVisitor() { + cont.visitChildren(new IVisitor() { public Object component(Component component) { for (Object behavior : component.getBehaviors()) { if (behavior instanceof IWireframeService) { return CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; } else if (behavior instanceof UnitBehavior) { - String position = ((UnitBehavior) behavior).getPosition(); - UnitSettings unit = settings.getUnit(position); - if (unit != null) { - YuiId body = unit.getBody(); - if (body != null) { - body.setParentId(null); - body.setId(component.getMarkupId()); - } - } else { - throw new RuntimeException("Invalid UnitBehavior position " + position); - } + settings.register(((UnitBehavior) behavior).getSettings()); return IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -15,16 +15,16 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.wicket.util.value.IValueMap; import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.util.MappingException; -import org.hippoecm.frontend.util.PluginConfigMapper; +import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; +import org.hippoecm.frontend.plugins.yui.javascript.IYuiListener; +import org.hippoecm.frontend.plugins.yui.javascript.SettingsArraySetting; +import org.hippoecm.frontend.plugins.yui.javascript.StringArraySetting; +import org.hippoecm.frontend.plugins.yui.javascript.YuiId; +import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; +import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; +import org.hippoecm.frontend.plugins.yui.javascript.YuiType; /** * Contains all settings of a wireframe and it's units. @@ -42,97 +42,183 @@ * and resize events. * *
  • - * UNITS: Array of {@UnitSettings} representing the units for this wireframe. These should be set by the same - * IPluginConfig object as the {@link WireframeSettings}.
    + * UNITS: Array of {@UnitSettings} representing the units for this wireframe. These can either be set by the same + * IPluginConfig object as the {@link WireframeSettings} or by merging the {@UnitSettings} of dynamically found + * {@link UnitBehavior}s.
    * The easiest way to configure units is storing the html and configuration all in the same place as the wireframe's * html and configuration. If we use an {@link IPluginConfig} for configuration, we can add a StringArray property * and add the positional name of the units we'd like to add: for example "top" and "center". This will cause the * {@link WireframeSettings} to lookup two String properties on the IPluginConfig named "top" and "center" which * should contain a comma-separated string of UnitSettings, like "id=center,scroll=true,width=120". *
    • + *
  • + * WRAPPERS: TODO + *
    • * * * Warning: this class currently extends the YuiObject which is deprecated and will soon be replaced by a POJO settings * file. Not sure how to handle default values and things like dont-escape-string yet. */ -public class WireframeSettings implements Serializable { +public class WireframeSettings extends YuiObject { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private YuiId rootId = new YuiId(""); - private YuiId parentId = new YuiId(""); - private boolean linkedWithParent = true; - private List units; + private static final YuiIdSetting ROOT_ID = new YuiIdSetting("rootId", new YuiId("")); + private static final YuiIdSetting PARENT_ID = new YuiIdSetting("parentId", new YuiId("")); + private static final BooleanSetting LINKED_WITH_PARENT = new BooleanSetting("linkedWithParent", false); - private String clientClassName = "YAHOO.hippo.Wireframe"; + private static final UnitSettingsArraySetting UNITS = new UnitSettingsArraySetting("units"); + private static final WrappersArraySetting WRAPPERS = new WrappersArraySetting("wrappers", new String[5]); + protected static final YuiType TYPE = new YuiType(ROOT_ID, PARENT_ID, LINKED_WITH_PARENT, UNITS, WRAPPERS); + + private IYuiListener unitListener = new IYuiListener() { + private static final long serialVersionUID = 1L; + + public void onEvent(IYuiListener.Event event) { + if (!active) { + notifyListeners(); + } + }; + }; + + private String clientClassName; + private String markupId; + private transient boolean active = false; + public WireframeSettings(IPluginConfig config) { - units = new ArrayList(5); - for (String position : new String[] {"top", "left", "center", "right", "bottom"}) { - String unitConfig = config.getString(position); - IValueMap unitPars = null; - if (unitConfig != null) { - unitPars = new ValueMap(unitConfig); - units.add(new UnitSettings(position, unitPars)); - } - } - try { - PluginConfigMapper.populate(this, config); - } catch (MappingException e) { - throw new RuntimeException(e); - } - rootId.setId(config.getString("root.id")); + super(TYPE, config); + clientClassName = config.getString("client.class.name", "YAHOO.hippo.Wireframe"); } public String getClientClassName() { return clientClassName; } - public void setClientClassName(String clientClassName) { - this.clientClassName = clientClassName; - } + public void setMarkupId(String markupId) { + this.markupId = markupId; - public void setMarkupId(String markupId) { - rootId.setParentId(markupId); - for (UnitSettings unit : units) { - unit.getId().setParentId(markupId); - unit.getBody().setParentId(markupId); + // don't send any notifications + active = true; + try { + YuiId root = getRootElementId(); + root.setParentId(markupId); + for (UnitSettings us : UNITS.get(this)) { + us.setParentMarkupId(markupId); + } + } finally { + active = false; } + notifyListeners(); } - public YuiId getRootId() { - return rootId; + public YuiId getRootElementId() { + return ROOT_ID.get(this); } - public void setParentId(YuiId parentId) { - this.parentId = parentId; + public void setParentId(YuiId id) { + PARENT_ID.set(id, this); } - public YuiId getParentId() { - return parentId; + public boolean isLinkedWithParent() { + return LINKED_WITH_PARENT.get(this); } - public void setLinkedWithParent(boolean linkedWithParent) { - this.linkedWithParent = linkedWithParent; + public UnitSettings getUnitSettingsByPosition(String position) { + return UNITS.getByPosition(position, this); } - public boolean isLinkedWithParent() { - return linkedWithParent; + public void register(UnitSettings newSettings) { + UnitSettings current = UNITS.getByPosition(newSettings.getPosition(), this); + if (current != null) { + current.removeListener(unitListener); + } + + UNITS.setByPosition(newSettings, this); + newSettings.setWrapperId(current.getWrapperId()); + newSettings.setParentMarkupId(markupId); + + if (newSettings != null) { + newSettings.addListener(unitListener); + } + notifyListeners(); } - public List getUnits() { - return Collections.unmodifiableList(units); + static class UnitSettingsArraySetting extends SettingsArraySetting { + private static final long serialVersionUID = 1L; + + public UnitSettingsArraySetting(String javascriptKey) { + super(javascriptKey, null); + } + + @Override + public UnitSettings[] newValue() { + return new UnitSettings[] { new UnitSettings(UnitSettings.TOP), new UnitSettings(UnitSettings.BOTTOM), + new UnitSettings(UnitSettings.LEFT), new UnitSettings(UnitSettings.RIGHT), + new UnitSettings(UnitSettings.CENTER) }; + } + + @Override + protected UnitSettings[] getValueFromConfig(IPluginConfig config, YuiObject settings) { + String[] ids = config.getStringArray(getKey()); + UnitSettings[] unitSettings = get(settings); + for (String id : ids) { + UnitSettings us = getByPosition(id, settings); + us.updateValues(new ValueMap(config.getString(id))); + } + return unitSettings; + } + + protected UnitSettings getByPosition(String position, YuiObject settings) { + UnitSettings[] unitSettings = get(settings); + for (UnitSettings setting : unitSettings) { + if (setting.getPosition().equals(position)) { + return setting; + } + } + throw new IllegalArgumentException("No UnitSettings found for position " + position); + } + + protected void setByPosition(UnitSettings us, WireframeSettings ws) { + UnitSettings[] usAr = get(ws); + for (int i = 0; i < usAr.length; i++) { + if (usAr[i].getPosition().equals(us.getPosition())) { + usAr[i] = us; + break; + } + } + } + + public void setFromString(String value, YuiObject settings) { + // TODO:implement + System.out.println("WWWAAARRRNNNIIINNNGGG!!!: SHOULDN'T SEE THIS!"); + } + } - public UnitSettings getUnit(String position) { - for (UnitSettings unit : units) { - if (unit.getPosition().equals(position)) { - return unit; + static class WrappersArraySetting extends StringArraySetting { + private static final long serialVersionUID = 1L; + + public WrappersArraySetting(String javascriptKey, String[] defaultValue) { + super(javascriptKey, defaultValue); + } + + @Override + public boolean isValid(String[] value) { + return false; + } + + @Override + protected String[] getValueFromConfig(IPluginConfig config, YuiObject settings) { + String[] ids = config.getStringArray(getKey()); + WireframeSettings ws = (WireframeSettings) settings; + for (String id : ids) { + UnitSettings setting = ws.getUnitSettingsByPosition(id); + setting.setWrapperId(config.getString(id)); } + return null; } - return null; } - } Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -1,81 +0,0 @@ -/* - * Copyright 2009 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.yui.layout; - -import java.io.Serializable; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -/** - * The YuiId allows for transparent element id resolution, without having to worry about id clashes on the client. - * - * The idea is really simple. A YuiId consists of an id value, and an optional parentId value. If the parentId is set, - * the YuiId will return an elementId like 'parentId:id', else it will only return the local id. - * - * The id value corresponds to an element in a {@link org.apache.wicket.Component}'s html file through the attribute - * yui:id, the parent id is a normal id-attribute, normally generated by Wicket and added to the YuiId once it's known. - * - * The YAHOO.hippo.LayoutManager module uses YAHOO.hippo.Dom.resolveElement(id) to resolve elements by their YuiId. - * For more info see: - * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/hippodom/hippodom.js - */ -public class YuiId implements Serializable { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - private String id; - private String parentId; - - public YuiId(String id) { - this.id = id; - } - - public String getElementId() { - if (parentId != null && !"".equals(parentId)) { - if (id != null && !"".equals(id)) { - return parentId + ":" + id; - } - } else { - return id; - } - return ""; - } - - public void setId(String id) { - this.id = id; - } - - public String getId() { - return id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", id) - .append("parentId", parentId).toString(); - } -} Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -1,36 +0,0 @@ -/* - * Copyright 2010 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.yui.layout; - -import net.sf.json.JsonConfig; -import net.sf.json.processors.JsonValueProcessor; - -public class YuiIdProcessor implements JsonValueProcessor { - - public Object processArrayValue(Object value, JsonConfig jsonConfig) { - return null; - } - - public Object processObjectValue(String key, Object value, JsonConfig jsonConfig) { - YuiId id = (YuiId) value; - String elid = id.getElementId(); - if (elid != null && !"".equals(elid)) { - return elid; - } - return null; - } - -} Modified: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html 2010-03-14 07:21:20 UTC (rev 22125) @@ -16,9 +16,6 @@ --> -
    -
    top
    -
    [label here]
    Modified: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -15,14 +15,11 @@ */ package org.hippoecm.frontend.plugins.yui.javascript; -import java.util.Map; -import java.util.TreeMap; - import junit.framework.TestCase; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; +import org.apache.wicket.behavior.IBehavior; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; @@ -36,8 +33,6 @@ import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; -import org.hippoecm.frontend.plugins.yui.layout.YuiId; -import org.hippoecm.frontend.plugins.yui.layout.YuiIdProcessor; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; import org.junit.Test; @@ -66,10 +61,26 @@ } @Test + public void testUnitSettingsInitializationFromConfig() { + IPluginConfig config = new JavaPluginConfig(); + config.put("position", "top"); + config.put("scroll", Boolean.TRUE); + + UnitSettings unitSettings = new UnitSettings(config); + assertTrue("top".equals(unitSettings.getPosition())); + + JSONObject wfObject = JSONObject.fromObject(unitSettings.toScript()); + assertTrue("top".equals(wfObject.get("position"))); + assertTrue(Boolean.TRUE.equals(wfObject.get("scroll"))); + } + + @Test public void testUnitSettingsInitializationFromString() { UnitSettings unitSettings = new UnitSettings("top", new ValueMap("scroll=true")); assertTrue("top".equals(unitSettings.getPosition())); - assertTrue(Boolean.TRUE.equals(unitSettings.isScroll())); + JSONObject wfObject = JSONObject.fromObject(unitSettings.toScript()); + assertTrue("top".equals(wfObject.get("position"))); + assertTrue(Boolean.TRUE.equals(wfObject.get("scroll"))); } public static class TestLabel extends Label { @@ -97,16 +108,14 @@ add(new WebAppBehavior(new WebAppSettings())); IPluginConfig config = new JavaPluginConfig(); - config.put("units", new String[] { "center", "top" }); - config.put("top", "id=top,body=top-body"); - config.put("center", "id=center-wrapper"); - config.put("linked.with.parent", false); + config.put("wrappers", new String[] { "center" }); + config.put("center", "center-wrapper"); wfSettings = new WireframeSettings(config); add(new WireframeBehavior(wfSettings)); Label panel; add(panel = new TestLabel("label", "label1", new Model("test"))); - panel.add(new UnitBehavior("center")); + panel.add(new UnitBehavior(new UnitSettings("center", new ValueMap("")))); add(new Link("action") { private static final long serialVersionUID = 1L; @@ -114,7 +123,7 @@ @Override public void onClick() { Label label = new TestLabel("label", "label2", new Model("testing 1 2 3")); - label.add(new UnitBehavior("center")); + label.add(new UnitBehavior(new UnitSettings("center", new ValueMap("scroll=true")))); TestPage.this.replace(label); } @@ -132,29 +141,24 @@ TestPage page = (TestPage) tester.startPage(TestPage.class); WireframeSettings wfSettings = page.getWireframeSettings(); -// System.out.println(wfSettings.toScript()); - JsonConfig jsonConfig = new JsonConfig(); - jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); - JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); - assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); + System.out.println(wfSettings.toScript()); + JSONObject wfObject = JSONObject.fromObject(wfSettings.toScript()); + assertTrue("".equals(wfObject.get("rootId"))); JSONArray units = wfObject.getJSONArray("units"); - Map unitMap = new TreeMap(); + JSONObject centerObject = null; for (int i = 0; i < units.size(); i++) { JSONObject unitObject = units.getJSONObject(i); - unitMap.put((String) unitObject.get("position"), unitObject); + if ("center".equals(unitObject.get("position"))) { + centerObject = unitObject; + break; + } } - - JSONObject centerObject = unitMap.get("center"); assertNotNull(centerObject); assertTrue("center".equals(centerObject.get("position"))); assertTrue("id01:center-wrapper".equals(centerObject.get("id"))); assertTrue("label1".equals(centerObject.get("body"))); assertTrue(Boolean.FALSE.equals(centerObject.get("scroll"))); - - JSONObject topObject = unitMap.get("top"); - assertTrue("id01:top".equals(topObject.get("id"))); - assertTrue("id01:top-body".equals(topObject.get("body"))); } @Test @@ -166,10 +170,8 @@ TestPage page = (TestPage) tester.getLastRenderedPage(); WireframeSettings wfSettings = page.getWireframeSettings(); - JsonConfig jsonConfig = new JsonConfig(); - jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); - JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); - assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); + JSONObject wfObject = JSONObject.fromObject(wfSettings.toScript()); + assertTrue("".equals(wfObject.get("rootId"))); JSONArray units = wfObject.getJSONArray("units"); JSONObject centerObject = null; Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -20,8 +20,8 @@ import java.util.Map; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.BeanUtilsBean; -import org.apache.wicket.util.value.IValueMap; +import org.apache.commons.beanutils.PropertyUtils; +import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,17 +33,16 @@ static final Logger log = LoggerFactory.getLogger(PluginConfigMapper.class); - public static void populate(Object bean, IValueMap config) throws MappingException { + public static void populate(Object bean, IPluginConfig config) throws MappingException { try { Map entries = BeanUtils.describe(bean); - BeanUtilsBean bub = BeanUtilsBean.getInstance(); for (Map.Entry entry : entries.entrySet()) { if ("class".equals(entry.getKey())) { continue; } String configKey = toConfigKey(entry.getKey()); if (config.containsKey(configKey)) { - bub.setProperty(bean, entry.getKey(), config.get(configKey)); + PropertyUtils.setSimpleProperty(bean, entry.getKey(), config.get(configKey)); } } } catch (IllegalAccessException e) { Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -26,8 +26,6 @@ import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.service.render.RenderService; -import org.hippoecm.frontend.util.MappingException; -import org.hippoecm.frontend.util.PluginConfigMapper; import org.hippoecm.frontend.widgets.Pinger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,12 +53,7 @@ context.unregisterService(this, modelId); } - PageLayoutSettings plSettings = new PageLayoutSettings(); - try { - PluginConfigMapper.populate(plSettings, config.getPluginConfig("yui.config")); - } catch (MappingException e) { - throw new RuntimeException(e); - } + PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("yui.config")); add(new PageLayoutBehavior(plSettings)); } Modified: hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml 2010-03-14 07:21:20 UTC (rev 22125) @@ -244,6 +244,10 @@ id=navigator-center,body=navigator-center-body,scroll=true + + top + center +     Modified: hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java =================================================================== --- hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java 2010-03-14 07:21:20 UTC (rev 22125) @@ -49,20 +49,4 @@ assertEquals(true, bean.isTestBool()); assertEquals("value", bean.getTestString()); } - - @Test - public void testStringValues() throws MappingException { - JavaPluginConfig jpc = new JavaPluginConfig(); - jpc.put("test.int", "1"); - jpc.put("test.bool", "true"); - jpc.put("test.string", "value"); - - MappingTestBean bean = new MappingTestBean(); - PluginConfigMapper.populate(bean, jpc); - - assertEquals(1, bean.getTestInt()); - assertEquals(true, bean.isTestBool()); - assertEquals("value", bean.getTestString()); - } - } Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-14 07:21:20 UTC (rev 22125) @@ -66,6 +66,10 @@ browse-perspective-wrapper + + left + center + @@ -138,21 +142,26 @@ frontend:pluginconfig - - id=navigator-top,height=25px,resize=false + + id=navigator-center,body=navigator-center-body,width=250 id=navigator-left,body=navigator-left-body,width=200,zindex=2,resize=true - - id=navigator-center,body=navigator-center-body,width=250 - true navigator-wrapper + + id=navigator-top,height=25px,resize=false + + + top + left + center + @@ -312,11 +321,8 @@ frontend:pluginconfig - - id=tabbed-panel-layout-top,height=25,gutter=0px 0px 0px 0px - - id=tabbed-panel-layout-center,gutter=0px 0px 0px 0px + tabbed-panel-layout-center true @@ -324,6 +330,13 @@ tabbed-panel-layout + + tabbed-panel-layout-top + + + top + center + @@ -339,9 +352,17 @@ org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - center - + + + frontend:pluginconfig + + + gutter=0px 0px 0px 0px + + + center + + @@ -356,9 +377,17 @@ org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - top - + + + frontend:pluginconfig + + + height=25,gutter=0px 0px 0px 0px + + + top + + Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml 2010-03-14 07:21:20 UTC (rev 22125) @@ -86,6 +86,12 @@ dashboard-perspective-wrapper + + top + left + center + right + Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-14 07:21:20 UTC (rev 22125) @@ -80,8 +80,12 @@ editor-perspective-wrapper - id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 + id=editor-perspective-top,height=24,zindex=1 + + top + center + Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-14 07:21:20 UTC (rev 22125) @@ -71,8 +71,12 @@ editor-perspective-wrapper - id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 + id=editor-perspective-top,height=24,zindex=1 + + top + center + Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-14 07:21:20 UTC (rev 22125) @@ -397,6 +397,9 @@ frontend:plugin + + service.center + org.hippoecm.frontend.plugins.cms.root.RootPlugin @@ -423,15 +426,29 @@ ie + + + frontend:pluginconfig + + + 0px 0px 0px 0px + + + 0px 0px 0px 0px + + + 50 + + frontend:pluginconfig - id=tabbed-panel-layout-center,height=1000 + tabbed-panel-layout-center - id=tabbed-panel-layout-left,width=50 + tabbed-panel-layout-left true @@ -439,7 +456,33 @@ tabbed-panel-layout + + left + center + + + + frontend:pluginconfig + + + height=1000 + + + center + + + + + frontend:pluginconfig + + + width=50 + + + left + + @@ -499,6 +542,10 @@ id=hippo-controlpanel-perspective-top,body=hippo-controlpanel-perspective-top-body,height=35 + + top + center + From helpdesk at onehippo.com Mon Mar 15 09:23:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Mon Mar 15 09:28:29 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3973) Author cannot create new document Message-ID: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Author cannot create new document --------------------------------- Key: HREPTWO-3973 URL: http://issues.onehippo.com/browse/HREPTWO-3973 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: ongoing Reporter: Frank van Lankvelt Priority: Top Fix For: r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 15 09:26:21 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 15 09:31:05 2010 Subject: [HippoRepos-dev] [22126] hippo-ecm/trunk: HREPTWO-3953: recommit with fix for console Message-ID: <20100315082621.999E31C020@svn.vm.castaserver.com> Revision: 22126 Author: fvlankvelt Date: 2010-03-15 09:26:20 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-3953: recommit with fix for console Modified Paths: -------------- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/BuiltinApplicationFactory.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml Added Paths: ----------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java Removed Paths: ------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java Modified: hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/cms/admin/src/main/java/org/hippoecm/frontend/plugins/cms/admin/AdminPerspective.html 2010-03-15 08:26:20 UTC (rev 22126) @@ -19,9 +19,9 @@
    bar -
    +
    -
    +
    Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-15 08:26:20 UTC (rev 22126) @@ -17,8 +17,10 @@
    -
    workflow here
    -
    feedback here
    +
    +
    workflow here
    +
    feedback here
    +
    Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -107,7 +107,7 @@ wfConfig = new JavaPluginConfig(); } wfSettings = new WireframeSettings(wfConfig); - UnitSettings topSettings = wfSettings.getUnitSettingsByPosition("top"); + UnitSettings topSettings = wfSettings.getUnit("top"); topHeight = topSettings.getHeight(); add(new WireframeBehavior(wfSettings)); } @@ -116,7 +116,7 @@ public void render(PluginRequestTarget target) { super.render(target); boolean hasMessage = feedback.anyMessage(); - UnitSettings topSettings = wfSettings.getUnitSettingsByPosition("top"); + UnitSettings topSettings = wfSettings.getUnit("top"); boolean updateTop = false; if (hasMessage && !feedbackShown) { topSettings.setHeight(Integer.valueOf( @@ -129,7 +129,7 @@ updateTop = true; } if (updateTop && isVisibleInHierarchy() && target != null) { - String topId = topSettings.getElementId(); + String topId = topSettings.getId().getElementId(); target.appendJavascript("YAHOO.hippo.LayoutManager.findLayoutUnit(YAHOO.util.Dom.get('" + topId + "')).set('height', " + topSettings.getHeight() + ");"); target.addComponent(feedback); Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.html 2010-03-15 08:26:20 UTC (rev 22126) @@ -33,7 +33,7 @@
    -
    +
    Modified: hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java =================================================================== --- hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/cms/root/src/main/java/org/hippoecm/frontend/plugins/cms/root/RootPlugin.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -15,7 +15,6 @@ */ package org.hippoecm.frontend.plugins.cms.root; -import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.PluginRequestTarget; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; @@ -27,7 +26,6 @@ import org.hippoecm.frontend.plugins.yui.layout.PageLayoutBehavior; import org.hippoecm.frontend.plugins.yui.layout.PageLayoutSettings; import org.hippoecm.frontend.plugins.yui.layout.UnitBehavior; -import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; @@ -48,7 +46,9 @@ add(new Pinger("pinger")); add(new LogoutLink("logout")); - PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("layout.page")); + PageLayoutSettings plSettings = new PageLayoutSettings(); + plSettings.setHeaderHeight(50); + // TODO: update settings from config add(new PageLayoutBehavior(plSettings)); add(new AjaxIndicatorBehavior()); @@ -68,18 +68,10 @@ add(new BrowserSpecificStylesheetsBehavior(configurations)); get("tabs").add(new WireframeBehavior(new WireframeSettings(config.getPluginConfig("layout.wireframe")))); - get("tabs:panel-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.panel")))); - get("tabs:tabs-container").add(new UnitBehavior(createSettings(config.getPluginConfig("layout.tabs")))); + get("tabs:panel-container").add(new UnitBehavior("center")); + get("tabs:tabs-container").add(new UnitBehavior("left")); } - static UnitSettings createSettings(IPluginConfig config) { - if (config.containsKey("options")) { - return new UnitSettings(config.getString("position"), new ValueMap(config.getString("options"))); - } else { - return new UnitSettings(config); - } - } - @Override public void render(PluginRequestTarget target) { if (!rendered) { Modified: hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml =================================================================== --- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-15 08:26:20 UTC (rev 22126) @@ -168,10 +168,6 @@ template-type-wrapper - - center - right - Modified: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -320,8 +320,7 @@ // YUCK! WebAppBehavior yuiWebApp = new WebAppBehavior(new WebAppSettings()); home.add(yuiWebApp); - context.registerService(yuiWebApp, "service.behavior.yui"); - home.add(new PageLayoutBehavior(new PageLayoutSettings(new JavaPluginConfig()))); + home.add(new PageLayoutBehavior(new PageLayoutSettings())); Node templateTypeNode = session.getRootNode().getNode("hippo:namespaces/test/edited"); JcrNodeModel nodeModel = new JcrNodeModel(templateTypeNode); @@ -357,8 +356,7 @@ // YUCK! WebAppBehavior yuiWebApp = new WebAppBehavior(new WebAppSettings()); home.add(yuiWebApp); - context.registerService(yuiWebApp, "service.behavior.yui"); - home.add(new PageLayoutBehavior(new PageLayoutSettings(new JavaPluginConfig()))); + home.add(new PageLayoutBehavior(new PageLayoutSettings())); Node templateTypeNode = session.getRootNode().getNode("hippo:namespaces/test/edited"); JcrNodeModel nodeModel = new JcrNodeModel(templateTypeNode); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/header/templates/DynamicTextTemplate.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -20,6 +20,7 @@ import java.util.Map; import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.IHeaderResponse; @@ -91,7 +92,7 @@ if (getSettings() instanceof YuiObject) { return ((YuiObject) getSettings()).toScript(); } else if (getSettings() != null) { - return JSONObject.fromObject(getSettings()).toString(); + return JSONObject.fromObject(getSettings(), getJsonConfig()).toString(); } else { return "null"; } @@ -121,4 +122,8 @@ return configuration; } + public JsonConfig getJsonConfig() { + return new JsonConfig(); + } + } Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiId.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -1,80 +0,0 @@ -/* - * Copyright 2009 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.yui.javascript; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; -import org.apache.wicket.IClusterable; - -/** - * The YuiId allows for transparent element id resolution, without having to worry about id clashes on the client. - * - * The idea is really simple. A YuiId consists of an id value, and an optional parentId value. If the parentId is set, - * the YuiId will return an elementId like 'parentId:id', else it will only return the local id. - * - * The id value corresponds to an element in a {@link org.apache.wicket.Component}'s html file through the attribute - * yui:id, the parent id is a normal id-attribute, normally generated by Wicket and added to the YuiId once it's known. - * - * The YAHOO.hippo.LayoutManager module uses YAHOO.hippo.Dom.resolveElement(id) to resolve elements by their YuiId. - * For more info see: - * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/hippodom/hippodom.js - */ -public class YuiId implements IClusterable { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - String id; - String parentId; - - public YuiId(String id) { - this.id = id; - } - - public String getElementId() { - if (parentId != null && !"".equals(parentId)) { - if (id != null && !"".equals(id)) { - return parentId + ":" + id; - } - } else { - return id; - } - return ""; - } - - public void setId(String id) { - this.id = id; - } - - public String getId() { - return id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", id) - .append("parentId", parentId).toString(); - } -} Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiIdSetting.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -1,59 +0,0 @@ -/* - * Copyright 2009 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.yui.javascript; - -import org.hippoecm.frontend.plugin.config.IPluginConfig; - -public class YuiIdSetting extends Setting { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - public YuiIdSetting(String javascriptKey) { - super(javascriptKey, null); - } - - public YuiIdSetting(String javascriptKey, YuiId defaultValue) { - super(javascriptKey, defaultValue); - } - - public YuiId newValue() { - if (defaultValue != null) { - YuiId id = new YuiId(defaultValue.id); - if (defaultValue.parentId != null) { - id.setParentId(defaultValue.parentId); - } - return id; - } else { - return null; - } - } - - @Override - protected YuiId getValueFromConfig(IPluginConfig config, YuiObject settings) { - return new YuiId(config.getString(configKey)); - } - - public void setFromString(String value, YuiObject settings) { - set(new YuiId(value), settings); - } - - public String getScriptValue(YuiId value) { - return StringSetting.escapeString(value.getElementId()); - } - -} Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/javascript/YuiObject.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -16,13 +16,12 @@ package org.hippoecm.frontend.plugins.yui.javascript; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import org.apache.wicket.IClusterable; import org.apache.wicket.util.value.IValueMap; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.util.PluginConfigMapper; /** * Base class for passing configuration to a YUI component on the client. @@ -39,11 +38,9 @@ private YuiType type; private Map, Object> settings; - private List listeners; public YuiObject(YuiType type) { this.type = type; - listeners = new LinkedList(); settings = new HashMap, Object>(); for (Setting setting : type.getProperties()) { this.settings.put(setting, setting.newValue()); @@ -78,31 +75,8 @@ void set(Setting key, Object value) { settings.put(key, value); - notifyListeners(); } - public void addListener(IYuiListener listener) { - listeners.add(listener); - } - - public void removeListener(IYuiListener listener) { - listeners.remove(listener); - } - - protected void notifyListeners() { - if (listeners.size() > 0) { - IYuiListener.Event event = new IYuiListener.Event() { - @Override - public YuiObject getSource() { - return YuiObject.this; - } - }; - for (IYuiListener listener : listeners) { - listener.onEvent(event); - } - } - } - public String toScript() { StringBuilder sb = new StringBuilder(); sb.append('{'); Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/IWireframeService.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -16,7 +16,6 @@ package org.hippoecm.frontend.plugins.yui.layout; import org.apache.wicket.behavior.IBehavior; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; /** * Base wireframe interface, allows wireframes that are linked to their parent to register Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutBehavior.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -15,15 +15,14 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import net.sf.json.JsonConfig; + import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.util.template.PackagedTextTemplate; -import org.hippoecm.frontend.plugins.yui.AbstractYuiAjaxBehavior; +import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; import org.hippoecm.frontend.plugins.yui.HippoNamespace; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.HippoTextTemplate; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; /** * Special purpose {@link WireframeBehavior} that automatically binds itself to the document body and creates a @@ -38,7 +37,7 @@ * * @see WireframeBehavior */ -public class PageLayoutBehavior extends AbstractYuiAjaxBehavior implements IWireframeService { +public class PageLayoutBehavior extends AbstractYuiBehavior implements IWireframeService { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -50,7 +49,6 @@ private HippoTextTemplate template; public PageLayoutBehavior(final PageLayoutSettings settings) { - super(settings); this.settings = settings; template = new HippoTextTemplate(INIT_PAGE, "YAHOO.hippo.GridsRootWireframe") { private static final long serialVersionUID = 1L; @@ -61,9 +59,16 @@ } @Override - public YuiObject getSettings() { + public PageLayoutSettings getSettings() { return settings; } + + @Override + public JsonConfig getJsonConfig() { + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + return jsonConfig; + } }; } @@ -75,10 +80,6 @@ } @Override - protected void respond(AjaxRequestTarget target) { - } - - @Override public void detach(Component component) { template.detach(); } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/PageLayoutSettings.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -15,58 +15,145 @@ */ package org.hippoecm.frontend.plugins.yui.layout; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.AjaxSettings; -import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; -import org.hippoecm.frontend.plugins.yui.javascript.IntSetting; -import org.hippoecm.frontend.plugins.yui.javascript.StringSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +import java.io.Serializable; -public class PageLayoutSettings extends AjaxSettings { + +public class PageLayoutSettings implements Serializable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private static final YuiIdSetting ROOT_ID = new YuiIdSetting("rootId", new YuiId("doc3")); + private YuiId rootId = new YuiId("doc3"); - private static final IntSetting HEADER_HEIGHT = new IntSetting("headerHeight"); - private static final IntSetting FOOTER_HEIGHT = new IntSetting("footerHeight"); - private static final IntSetting LEFT_WIDTH = new IntSetting("leftWidth"); - private static final IntSetting RIGHT_WIDTH = new IntSetting("rightWidth"); + private int headerHeight; + private int footerHeight; + private int leftWidth; + private int rightWidth; - private static final StringSetting HEADER_GUTTER = new StringSetting("headerGutter"); - private static final StringSetting BODY_GUTTER = new StringSetting("bodyGutter"); - private static final StringSetting FOOTER_GUTTER = new StringSetting("footerGutter"); - private static final StringSetting LEFT_GUTTER = new StringSetting("leftGutter"); - private static final StringSetting RIGHT_GUTTER = new StringSetting("rightGutter"); + private String headerGutter = "0px 0px 0px 0px"; + private String bodyGutter = "0px 0px 0px 0px"; + private String leftGutter = "0px 0px 0px 0px"; + private String rightGutter = "0px 0px 0px 0px"; - private static final BooleanSetting BODY_SCROLL = new BooleanSetting("bodyScroll"); - private static final BooleanSetting HEADER_SCROLL = new BooleanSetting("headerScroll"); - private static final BooleanSetting FOOTER_SCROLL = new BooleanSetting("footerScroll"); - private static final BooleanSetting LEFT_SCROLL = new BooleanSetting("leftScroll"); - private static final BooleanSetting RIGHT_SCROLL = new BooleanSetting("rightScroll"); - - private static final BooleanSetting HEADER_RESIZE = new BooleanSetting("headerResize"); - private static final BooleanSetting FOOTER_RESIZE = new BooleanSetting("footerResize"); - private static final BooleanSetting LEFT_RESIZE = new BooleanSetting("leftResize"); - private static final BooleanSetting RIGHT_RESIZE = new BooleanSetting("rightResize"); - + private boolean bodyScroll; + private boolean headerScroll; + private boolean footerScroll; + private boolean leftScroll; + private boolean rightScroll; - protected static final YuiType TYPE = new YuiType(AjaxSettings.TYPE, ROOT_ID, - HEADER_HEIGHT, FOOTER_HEIGHT, LEFT_WIDTH, RIGHT_WIDTH, - HEADER_GUTTER, BODY_GUTTER, FOOTER_GUTTER, LEFT_GUTTER, RIGHT_GUTTER, - HEADER_SCROLL, FOOTER_SCROLL, LEFT_SCROLL, RIGHT_SCROLL, BODY_SCROLL, - HEADER_RESIZE, FOOTER_RESIZE, LEFT_RESIZE, RIGHT_RESIZE); + private boolean headerResize; + private boolean footerResize; + private boolean leftResize; + private boolean rightResize; - public PageLayoutSettings(IPluginConfig config) { - super(TYPE, config); + public void setRootId(YuiId rootId) { + this.rootId = rootId; } - public YuiId getRootId() { - return ROOT_ID.get(this); + return rootId; } + public void setHeaderHeight(int headerHeight) { + this.headerHeight = headerHeight; + } + public int getHeaderHeight() { + return headerHeight; + } + public void setFooterHeight(int footerHeight) { + this.footerHeight = footerHeight; + } + public int getFooterHeight() { + return footerHeight; + } + public void setLeftWidth(int leftWidth) { + this.leftWidth = leftWidth; + } + public int getLeftWidth() { + return leftWidth; + } + public void setRightWidth(int rightWidth) { + this.rightWidth = rightWidth; + } + public int getRightWidth() { + return rightWidth; + } + public void setHeaderGutter(String headerGutter) { + this.headerGutter = headerGutter; + } + public String getHeaderGutter() { + return headerGutter; + } + public void setBodyGutter(String bodyGutter) { + this.bodyGutter = bodyGutter; + } + public String getBodyGutter() { + return bodyGutter; + } + public void setLeftGutter(String leftGutter) { + this.leftGutter = leftGutter; + } + public String getLeftGutter() { + return leftGutter; + } + public void setRightGutter(String rightGutter) { + this.rightGutter = rightGutter; + } + public String getRightGutter() { + return rightGutter; + } + public void setBodyScroll(boolean bodyScroll) { + this.bodyScroll = bodyScroll; + } + public boolean isBodyScroll() { + return bodyScroll; + } + public void setHeaderScroll(boolean headerScroll) { + this.headerScroll = headerScroll; + } + public boolean isHeaderScroll() { + return headerScroll; + } + public void setFooterScroll(boolean footerScroll) { + this.footerScroll = footerScroll; + } + public boolean isFooterScroll() { + return footerScroll; + } + public void setLeftScroll(boolean leftScroll) { + this.leftScroll = leftScroll; + } + public boolean isLeftScroll() { + return leftScroll; + } + public void setRightScroll(boolean rightScroll) { + this.rightScroll = rightScroll; + } + public boolean isRightScroll() { + return rightScroll; + } + public void setHeaderResize(boolean headerResize) { + this.headerResize = headerResize; + } + public boolean isHeaderResize() { + return headerResize; + } + public void setFooterResize(boolean footerResize) { + this.footerResize = footerResize; + } + public boolean isFooterResize() { + return footerResize; + } + public void setLeftResize(boolean leftResize) { + this.leftResize = leftResize; + } + public boolean isLeftResize() { + return leftResize; + } + public void setRightResize(boolean rightResize) { + this.rightResize = rightResize; + } + public boolean isRightResize() { + return rightResize; + } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitBehavior.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -16,7 +16,6 @@ package org.hippoecm.frontend.plugins.yui.layout; -import java.util.List; import java.util.Map; import org.apache.commons.lang.builder.HashCodeBuilder; @@ -44,16 +43,15 @@ static final Logger log = LoggerFactory.getLogger(UnitBehavior.class); - private UnitSettings settings; + private String position; - public UnitBehavior(UnitSettings settings) { - this.settings = settings; + public UnitBehavior(String position) { + this.position = position; } @Override public void bind(final Component component) { super.bind(component); - settings.setMarkupId(component.getMarkupId(true)); // re-render complete wireframe during the render phase AjaxRequestTarget target = AjaxRequestTarget.get(); @@ -66,7 +64,7 @@ MarkupContainer parent = component.getParent(); boolean found = false; while (parent != null) { - for (IBehavior behavior : (List) parent.getBehaviors()) { + for (IBehavior behavior : parent.getBehaviors()) { if (behavior instanceof IWireframeService) { target.addComponent(parent); found = true; @@ -89,8 +87,8 @@ } } - public UnitSettings getSettings() { - return settings; + public String getPosition() { + return position; } @Override Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitPlugin.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -16,17 +16,14 @@ package org.hippoecm.frontend.plugins.yui.layout; import org.apache.wicket.behavior.IBehavior; -import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.plugin.IPlugin; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.Plugin; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.YuiPluginHelper; import org.hippoecm.frontend.service.IBehaviorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Special purpose {@link Plugin} that allows us to add the behavior through configuration instead of adding it * in code to our component. @@ -51,14 +48,6 @@ } public IBehavior getBehavior() { - return new UnitBehavior(createSettings(YuiPluginHelper.getConfig(getPluginConfig()))); + return new UnitBehavior(getPluginConfig().getString("position")); } - - static UnitSettings createSettings(IPluginConfig config) { - if (config.containsKey("options")) { - return new UnitSettings(config.getString("position"), new ValueMap(config.getString("options"))); - } else { - return new UnitSettings(config); - } - } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -15,15 +15,11 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import java.io.Serializable; + import org.apache.wicket.util.value.IValueMap; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; -import org.hippoecm.frontend.plugins.yui.javascript.IntSetting; -import org.hippoecm.frontend.plugins.yui.javascript.StringSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; -import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +34,9 @@ * ID: a {@link YuiId} value representing the unit's root element. * *
  • - * BODY: a {@link YuiId} value representing the unit's body element. + * BODY: a {@link YuiId} value representing the unit's body element. The body should not be configured when the unit + * wraps a {@link Component} with a {@link UnitBehavior}. When neither body nor UnitBehavior is present, a body + * element will be generated. *
    • *
  • * WIDTH: width (in pixels) that the unit will take up in the wireframe (only applies to left and right units and @@ -75,7 +73,7 @@ *
    • * */ -public class UnitSettings extends YuiObject { +public class UnitSettings implements Serializable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -83,155 +81,119 @@ static final Logger log = LoggerFactory.getLogger(UnitSettings.class); - private static final StringSetting POSITION = new StringSetting("position"); - private static final YuiIdSetting ID = new YuiIdSetting("id"); - private static final YuiIdSetting BODY = new YuiIdSetting("body"); + private String position = "center"; + private YuiId id = new YuiId(""); + private YuiId body = new YuiId(""); - private static final StringSetting WIDTH = new StringSetting("width"); - private static final StringSetting HEIGHT = new StringSetting("height"); + private String width; + private String height; - private static final StringSetting MIN_WIDTH = new StringSetting("minWidth"); - private static final StringSetting MIN_HEIGHT = new StringSetting("minHeight"); + private String minWidth; + private String minHeight; - private static final StringSetting GUTTER = new StringSetting("gutter"); - private static final BooleanSetting SCROLL = new BooleanSetting("scroll"); - private static final BooleanSetting RESIZE = new BooleanSetting("resize"); - private static final BooleanSetting USE_SHIM = new BooleanSetting("useShim"); - + private String gutter = "0px 0px 0px 0px"; + private boolean scroll; + private boolean resize; + private boolean useShim; + //TODO: does this still work? - private static final IntSetting Z_INDEX = new IntSetting("zindex"); + //private static final IntSetting Z_INDEX = new IntSetting("zindex"); - protected final static YuiType TYPE = new YuiType(POSITION, ID, BODY, WIDTH, HEIGHT, MIN_WIDTH, MIN_HEIGHT, GUTTER, - SCROLL, RESIZE, Z_INDEX, USE_SHIM); - public static final String TOP = "top"; public static final String RIGHT = "right"; public static final String BOTTOM = "bottom"; public static final String LEFT = "left"; public static final String CENTER = "center"; - private String wrapperId; - private String markupId; - - public UnitSettings(String position) { - super(TYPE); - POSITION.set(position, this); + public UnitSettings(String position, IValueMap config) { + this.position = position; + if (config != null) { + try { + PluginConfigMapper.populate(this, config); + } catch (MappingException e) { + throw new RuntimeException("invalid configuration"); + } + id.setId(config.getString("id")); + if (config.containsKey("body")) { + body.setId(config.getString("body")); + } + } } - public UnitSettings(String position, IValueMap options) { - super(TYPE); - POSITION.set(position, this); - updateValues(options); + public String getPosition() { + return position; } - public UnitSettings(IPluginConfig config) { - super(TYPE, config); + public void setWidth(String width) { + this.width = width; } - public void setPosition(String position, YuiObject settings) { - POSITION.set(position, settings); - } - - public String getPosition() { - return POSITION.get(this); - } - public String getWidth() { - return WIDTH.get(this); + return width; } - public void setWidth(String width) { - WIDTH.set(width, this); + public void setHeight(String height) { + this.height = height; } public String getHeight() { - return HEIGHT.get(this); + return height; } - public void setHeight(String height) { - HEIGHT.set(height, this); + public void setMinWidth(String minWidth) { + this.minWidth = minWidth; } public String getMinWidth() { - return MIN_WIDTH.get(this); + return minWidth; } - public void setMinWidth(String minWidth) { - MIN_WIDTH.set(minWidth, this); + public void setMinHeight(String minHeight) { + this.minHeight = minHeight; } public String getMinHeight() { - return MIN_HEIGHT.get(this); + return minHeight; } - public void setMinHeight(String minHeight) { - MIN_HEIGHT.set(minHeight, this); + public void setGutter(String gutter) { + this.gutter = gutter; } - public String getElementId() { - return ID.get(this).getElementId(); + public String getGutter() { + return gutter; } - public String getWrapperId() { - return wrapperId; + public void setScroll(boolean scroll) { + this.scroll = scroll; } - public void setWrapperId(String id) { - wrapperId = id; - notifyListeners(); + public boolean isScroll() { + return scroll; } - public String getMarkupId() { - return markupId; + public void setResize(boolean resize) { + this.resize = resize; } - public String getBody() { - return BODY.getScriptValue(BODY.get(this)); + public boolean isResize() { + return resize; } - public void setMarkupId(String markupId) { - this.markupId = markupId; - if (wrapperId != null) { - if (BODY.get(this) != null) { - BODY.get(this).setId(markupId); - } - } - notifyListeners(); + public void setUseShim(boolean useShim) { + this.useShim = useShim; } - @Override - public boolean isValid() { - return ID.get(this) != null; + public boolean isUseShim() { + return useShim; } - public void setParentMarkupId(String parentMarkupId) { - if (wrapperId != null) { - YuiId id = ID.get(this); - if (id == null) { - ID.set(new YuiId(wrapperId), this); - id = ID.get(this); - } else { - id.setId(wrapperId); - } - id.setParentId(parentMarkupId); + public YuiId getBody() { + return body; + } - YuiId body = BODY.get(this); - if (body == null) { - BODY.set(new YuiId(markupId), this); - } else { - body.setId(markupId); - body.setParentId(null); - } - } else if (ID.get(this) != null) { - YuiId id = ID.get(this); - id.setParentId(parentMarkupId); - - YuiId body = BODY.get(this); - if (body != null) { - body.setParentId(parentMarkupId); - } - } - notifyListeners(); + public YuiId getId() { + return id; } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeBehavior.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -15,19 +15,19 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import java.io.Serializable; + +import net.sf.json.JsonConfig; + import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Component.IVisitor; -import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.util.template.PackagedTextTemplate; import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; import org.hippoecm.frontend.plugins.yui.HippoNamespace; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.HippoTextTemplate; -import org.hippoecm.frontend.plugins.yui.javascript.IYuiListener; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; import org.hippoecm.frontend.service.render.RenderService; /** @@ -128,7 +128,7 @@ *

    * * @see org.hippoecm.frontend.plugins.yui.layout.WireframeSettings - * @see org.hippoecm.frontend.plugins.yui.javascript.YuiId + * @see org.hippoecm.frontend.plugins.yui.layout.YuiId */ public class WireframeBehavior extends AbstractYuiBehavior implements IWireframeService { @@ -146,32 +146,26 @@ public WireframeBehavior(final WireframeSettings settings) { this.settings = settings; - this.settings.addListener(new IYuiListener() { - private static final long serialVersionUID = 1L; - public void onEvent(Event event) { - if (component != null) { - AjaxRequestTarget target = AjaxRequestTarget.get(); - if (target != null) { - target.addComponent(component); - } - } - } - - }); - template = new HippoTextTemplate(behaviorJs, settings.getClientClassName()) { private static final long serialVersionUID = 1L; @Override public String getId() { - return settings.getRootElementId().getElementId(); + return settings.getRootId().getElementId(); } @Override - public YuiObject getSettings() { + public Serializable getSettings() { return settings; } + + @Override + public JsonConfig getJsonConfig() { + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + return jsonConfig; + } }; } @@ -179,7 +173,7 @@ * Implements IWireframeService */ public YuiId getParentId() { - return settings.getRootElementId(); + return settings.getRootId(); } @Override @@ -229,13 +223,23 @@ //Visit child components in order to find components that contain a {@link UnitBehavior}. If another wireframe //or unit is encountered, stop going deeper. MarkupContainer cont = (MarkupContainer) component; - cont.visitChildren(new IVisitor() { + cont.visitChildren(new IVisitor() { public Object component(Component component) { for (Object behavior : component.getBehaviors()) { if (behavior instanceof IWireframeService) { return CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; } else if (behavior instanceof UnitBehavior) { - settings.register(((UnitBehavior) behavior).getSettings()); + String position = ((UnitBehavior) behavior).getPosition(); + UnitSettings unit = settings.getUnit(position); + if (unit != null) { + YuiId body = unit.getBody(); + if (body != null) { + body.setParentId(null); + body.setId(component.getMarkupId()); + } + } else { + throw new RuntimeException("Invalid UnitBehavior position " + position); + } return IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER; } } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframeSettings.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -15,16 +15,16 @@ */ package org.hippoecm.frontend.plugins.yui.layout; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.wicket.util.value.IValueMap; import org.apache.wicket.util.value.ValueMap; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; -import org.hippoecm.frontend.plugins.yui.javascript.IYuiListener; -import org.hippoecm.frontend.plugins.yui.javascript.SettingsArraySetting; -import org.hippoecm.frontend.plugins.yui.javascript.StringArraySetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiId; -import org.hippoecm.frontend.plugins.yui.javascript.YuiIdSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; -import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; /** * Contains all settings of a wireframe and it's units. @@ -42,183 +42,97 @@ * and resize events. * *
  • - * UNITS: Array of {@UnitSettings} representing the units for this wireframe. These can either be set by the same - * IPluginConfig object as the {@link WireframeSettings} or by merging the {@UnitSettings} of dynamically found - * {@link UnitBehavior}s.
    + * UNITS: Array of {@UnitSettings} representing the units for this wireframe. These should be set by the same + * IPluginConfig object as the {@link WireframeSettings}.
    * The easiest way to configure units is storing the html and configuration all in the same place as the wireframe's * html and configuration. If we use an {@link IPluginConfig} for configuration, we can add a StringArray property * and add the positional name of the units we'd like to add: for example "top" and "center". This will cause the * {@link WireframeSettings} to lookup two String properties on the IPluginConfig named "top" and "center" which * should contain a comma-separated string of UnitSettings, like "id=center,scroll=true,width=120". *
    • - *
  • - * WRAPPERS: TODO - *
    • * * * Warning: this class currently extends the YuiObject which is deprecated and will soon be replaced by a POJO settings * file. Not sure how to handle default values and things like dont-escape-string yet. */ -public class WireframeSettings extends YuiObject { +public class WireframeSettings implements Serializable { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; private static final long serialVersionUID = 1L; - private static final YuiIdSetting ROOT_ID = new YuiIdSetting("rootId", new YuiId("")); - private static final YuiIdSetting PARENT_ID = new YuiIdSetting("parentId", new YuiId("")); - private static final BooleanSetting LINKED_WITH_PARENT = new BooleanSetting("linkedWithParent", false); + private YuiId rootId = new YuiId(""); + private YuiId parentId = new YuiId(""); + private boolean linkedWithParent = true; + private List units; - private static final UnitSettingsArraySetting UNITS = new UnitSettingsArraySetting("units"); - private static final WrappersArraySetting WRAPPERS = new WrappersArraySetting("wrappers", new String[5]); + private String clientClassName = "YAHOO.hippo.Wireframe"; - protected static final YuiType TYPE = new YuiType(ROOT_ID, PARENT_ID, LINKED_WITH_PARENT, UNITS, WRAPPERS); - - private IYuiListener unitListener = new IYuiListener() { - private static final long serialVersionUID = 1L; - - public void onEvent(IYuiListener.Event event) { - if (!active) { - notifyListeners(); - } - }; - }; - - private String clientClassName; - private String markupId; - private transient boolean active = false; - public WireframeSettings(IPluginConfig config) { - super(TYPE, config); - clientClassName = config.getString("client.class.name", "YAHOO.hippo.Wireframe"); + units = new ArrayList(5); + for (String position : new String[] {"top", "left", "center", "right", "bottom"}) { + String unitConfig = config.getString(position); + IValueMap unitPars = null; + if (unitConfig != null) { + unitPars = new ValueMap(unitConfig); + units.add(new UnitSettings(position, unitPars)); + } + } + try { + PluginConfigMapper.populate(this, config); + } catch (MappingException e) { + throw new RuntimeException(e); + } + rootId.setId(config.getString("root.id")); } public String getClientClassName() { return clientClassName; } - public void setMarkupId(String markupId) { - this.markupId = markupId; + public void setClientClassName(String clientClassName) { + this.clientClassName = clientClassName; + } - // don't send any notifications - active = true; - try { - YuiId root = getRootElementId(); - root.setParentId(markupId); - for (UnitSettings us : UNITS.get(this)) { - us.setParentMarkupId(markupId); - } - } finally { - active = false; + public void setMarkupId(String markupId) { + rootId.setParentId(markupId); + for (UnitSettings unit : units) { + unit.getId().setParentId(markupId); + unit.getBody().setParentId(markupId); } - notifyListeners(); } - public YuiId getRootElementId() { - return ROOT_ID.get(this); + public YuiId getRootId() { + return rootId; } - public void setParentId(YuiId id) { - PARENT_ID.set(id, this); + public void setParentId(YuiId parentId) { + this.parentId = parentId; } - public boolean isLinkedWithParent() { - return LINKED_WITH_PARENT.get(this); + public YuiId getParentId() { + return parentId; } - public UnitSettings getUnitSettingsByPosition(String position) { - return UNITS.getByPosition(position, this); + public void setLinkedWithParent(boolean linkedWithParent) { + this.linkedWithParent = linkedWithParent; } - public void register(UnitSettings newSettings) { - UnitSettings current = UNITS.getByPosition(newSettings.getPosition(), this); - if (current != null) { - current.removeListener(unitListener); - } - - UNITS.setByPosition(newSettings, this); - newSettings.setWrapperId(current.getWrapperId()); - newSettings.setParentMarkupId(markupId); - - if (newSettings != null) { - newSettings.addListener(unitListener); - } - notifyListeners(); + public boolean isLinkedWithParent() { + return linkedWithParent; } - static class UnitSettingsArraySetting extends SettingsArraySetting { - private static final long serialVersionUID = 1L; - - public UnitSettingsArraySetting(String javascriptKey) { - super(javascriptKey, null); - } - - @Override - public UnitSettings[] newValue() { - return new UnitSettings[] { new UnitSettings(UnitSettings.TOP), new UnitSettings(UnitSettings.BOTTOM), - new UnitSettings(UnitSettings.LEFT), new UnitSettings(UnitSettings.RIGHT), - new UnitSettings(UnitSettings.CENTER) }; - } - - @Override - protected UnitSettings[] getValueFromConfig(IPluginConfig config, YuiObject settings) { - String[] ids = config.getStringArray(getKey()); - UnitSettings[] unitSettings = get(settings); - for (String id : ids) { - UnitSettings us = getByPosition(id, settings); - us.updateValues(new ValueMap(config.getString(id))); - } - return unitSettings; - } - - protected UnitSettings getByPosition(String position, YuiObject settings) { - UnitSettings[] unitSettings = get(settings); - for (UnitSettings setting : unitSettings) { - if (setting.getPosition().equals(position)) { - return setting; - } - } - throw new IllegalArgumentException("No UnitSettings found for position " + position); - } - - protected void setByPosition(UnitSettings us, WireframeSettings ws) { - UnitSettings[] usAr = get(ws); - for (int i = 0; i < usAr.length; i++) { - if (usAr[i].getPosition().equals(us.getPosition())) { - usAr[i] = us; - break; - } - } - } - - public void setFromString(String value, YuiObject settings) { - // TODO:implement - System.out.println("WWWAAARRRNNNIIINNNGGG!!!: SHOULDN'T SEE THIS!"); - } - + public List getUnits() { + return Collections.unmodifiableList(units); } - static class WrappersArraySetting extends StringArraySetting { - private static final long serialVersionUID = 1L; - - public WrappersArraySetting(String javascriptKey, String[] defaultValue) { - super(javascriptKey, defaultValue); - } - - @Override - public boolean isValid(String[] value) { - return false; - } - - @Override - protected String[] getValueFromConfig(IPluginConfig config, YuiObject settings) { - String[] ids = config.getStringArray(getKey()); - WireframeSettings ws = (WireframeSettings) settings; - for (String id : ids) { - UnitSettings setting = ws.getUnitSettingsByPosition(id); - setting.setWrapperId(config.getString(id)); + public UnitSettings getUnit(String position) { + for (UnitSettings unit : units) { + if (unit.getPosition().equals(position)) { + return unit; } - return null; } + return null; } + } Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java (from rev 22124, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiId.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -0,0 +1,81 @@ +/* + * Copyright 2009 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.yui.layout; + +import java.io.Serializable; + +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +/** + * The YuiId allows for transparent element id resolution, without having to worry about id clashes on the client. + * + * The idea is really simple. A YuiId consists of an id value, and an optional parentId value. If the parentId is set, + * the YuiId will return an elementId like 'parentId:id', else it will only return the local id. + * + * The id value corresponds to an element in a {@link org.apache.wicket.Component}'s html file through the attribute + * yui:id, the parent id is a normal id-attribute, normally generated by Wicket and added to the YuiId once it's known. + * + * The YAHOO.hippo.LayoutManager module uses YAHOO.hippo.Dom.resolveElement(id) to resolve elements by their YuiId. + * For more info see: + * hippo-ecm-addon-yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/hippodom/hippodom.js + */ +public class YuiId implements Serializable { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private String id; + private String parentId; + + public YuiId(String id) { + this.id = id; + } + + public String getElementId() { + if (parentId != null && !"".equals(parentId)) { + if (id != null && !"".equals(id)) { + return parentId + ":" + id; + } + } else { + return id; + } + return ""; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", id) + .append("parentId", parentId).toString(); + } +} Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java (from rev 22124, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdProcessor.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -0,0 +1,36 @@ +/* + * Copyright 2010 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.yui.layout; + +import net.sf.json.JsonConfig; +import net.sf.json.processors.JsonValueProcessor; + +public class YuiIdProcessor implements JsonValueProcessor { + + public Object processArrayValue(Object value, JsonConfig jsonConfig) { + return null; + } + + public Object processObjectValue(String key, Object value, JsonConfig jsonConfig) { + YuiId id = (YuiId) value; + String elid = id.getElementId(); + if (elid != null && !"".equals(elid)) { + return elid; + } + return null; + } + +} Modified: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings$TestPage.html 2010-03-15 08:26:20 UTC (rev 22126) @@ -16,6 +16,9 @@ --> +
    +
    top
    +
    [label here]
    Modified: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/javascript/TestSettings.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -15,11 +15,14 @@ */ package org.hippoecm.frontend.plugins.yui.javascript; +import java.util.Map; +import java.util.TreeMap; + import junit.framework.TestCase; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; -import org.apache.wicket.behavior.IBehavior; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; @@ -33,6 +36,8 @@ import org.hippoecm.frontend.plugins.yui.layout.UnitSettings; import org.hippoecm.frontend.plugins.yui.layout.WireframeBehavior; import org.hippoecm.frontend.plugins.yui.layout.WireframeSettings; +import org.hippoecm.frontend.plugins.yui.layout.YuiId; +import org.hippoecm.frontend.plugins.yui.layout.YuiIdProcessor; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; import org.junit.Test; @@ -61,26 +66,10 @@ } @Test - public void testUnitSettingsInitializationFromConfig() { - IPluginConfig config = new JavaPluginConfig(); - config.put("position", "top"); - config.put("scroll", Boolean.TRUE); - - UnitSettings unitSettings = new UnitSettings(config); - assertTrue("top".equals(unitSettings.getPosition())); - - JSONObject wfObject = JSONObject.fromObject(unitSettings.toScript()); - assertTrue("top".equals(wfObject.get("position"))); - assertTrue(Boolean.TRUE.equals(wfObject.get("scroll"))); - } - - @Test public void testUnitSettingsInitializationFromString() { UnitSettings unitSettings = new UnitSettings("top", new ValueMap("scroll=true")); assertTrue("top".equals(unitSettings.getPosition())); - JSONObject wfObject = JSONObject.fromObject(unitSettings.toScript()); - assertTrue("top".equals(wfObject.get("position"))); - assertTrue(Boolean.TRUE.equals(wfObject.get("scroll"))); + assertTrue(Boolean.TRUE.equals(unitSettings.isScroll())); } public static class TestLabel extends Label { @@ -108,14 +97,16 @@ add(new WebAppBehavior(new WebAppSettings())); IPluginConfig config = new JavaPluginConfig(); - config.put("wrappers", new String[] { "center" }); - config.put("center", "center-wrapper"); + config.put("units", new String[] { "center", "top" }); + config.put("top", "id=top,body=top-body"); + config.put("center", "id=center-wrapper"); + config.put("linked.with.parent", false); wfSettings = new WireframeSettings(config); add(new WireframeBehavior(wfSettings)); Label panel; add(panel = new TestLabel("label", "label1", new Model("test"))); - panel.add(new UnitBehavior(new UnitSettings("center", new ValueMap("")))); + panel.add(new UnitBehavior("center")); add(new Link("action") { private static final long serialVersionUID = 1L; @@ -123,7 +114,7 @@ @Override public void onClick() { Label label = new TestLabel("label", "label2", new Model("testing 1 2 3")); - label.add(new UnitBehavior(new UnitSettings("center", new ValueMap("scroll=true")))); + label.add(new UnitBehavior("center")); TestPage.this.replace(label); } @@ -141,24 +132,29 @@ TestPage page = (TestPage) tester.startPage(TestPage.class); WireframeSettings wfSettings = page.getWireframeSettings(); - System.out.println(wfSettings.toScript()); - JSONObject wfObject = JSONObject.fromObject(wfSettings.toScript()); - assertTrue("".equals(wfObject.get("rootId"))); +// System.out.println(wfSettings.toScript()); + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); + assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); JSONArray units = wfObject.getJSONArray("units"); - JSONObject centerObject = null; + Map unitMap = new TreeMap(); for (int i = 0; i < units.size(); i++) { JSONObject unitObject = units.getJSONObject(i); - if ("center".equals(unitObject.get("position"))) { - centerObject = unitObject; - break; - } + unitMap.put((String) unitObject.get("position"), unitObject); } + + JSONObject centerObject = unitMap.get("center"); assertNotNull(centerObject); assertTrue("center".equals(centerObject.get("position"))); assertTrue("id01:center-wrapper".equals(centerObject.get("id"))); assertTrue("label1".equals(centerObject.get("body"))); assertTrue(Boolean.FALSE.equals(centerObject.get("scroll"))); + + JSONObject topObject = unitMap.get("top"); + assertTrue("id01:top".equals(topObject.get("id"))); + assertTrue("id01:top-body".equals(topObject.get("body"))); } @Test @@ -170,8 +166,10 @@ TestPage page = (TestPage) tester.getLastRenderedPage(); WireframeSettings wfSettings = page.getWireframeSettings(); - JSONObject wfObject = JSONObject.fromObject(wfSettings.toScript()); - assertTrue("".equals(wfObject.get("rootId"))); + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + JSONObject wfObject = JSONObject.fromObject(wfSettings, jsonConfig); + assertTrue(((JSONObject) wfObject.get("rootId")).isNullObject()); JSONArray units = wfObject.getJSONArray("units"); JSONObject centerObject = null; Deleted: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java 2010-03-12 15:24:16 UTC (rev 22124) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -1,28 +0,0 @@ -package org.hippoecm.frontend.plugins.yui.layout; - -import static org.junit.Assert.assertEquals; -import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; - -import org.junit.Test; - -public class YuiIdTest { - - public static class TestSetting { - - public YuiId getId() { - YuiId id = new YuiId("child"); - id.setParentId("parent"); - return id; - } - } - - @Test - public void testSerialization() { - JsonConfig jsonConfig = new JsonConfig(); - jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); - - String result = JSONObject.fromObject(new TestSetting(), jsonConfig).toString(); - assertEquals("{\"id\":\"parent:child\"}", result); - } -} Copied: hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java (from rev 22124, hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java) =================================================================== --- hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/test/java/org/hippoecm/frontend/plugins/yui/layout/YuiIdTest.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -0,0 +1,28 @@ +package org.hippoecm.frontend.plugins.yui.layout; + +import static org.junit.Assert.assertEquals; +import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; + +import org.junit.Test; + +public class YuiIdTest { + + public static class TestSetting { + + public YuiId getId() { + YuiId id = new YuiId("child"); + id.setParentId("parent"); + return id; + } + } + + @Test + public void testSerialization() { + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(YuiId.class, new YuiIdProcessor()); + + String result = JSONObject.fromObject(new TestSetting(), jsonConfig).toString(); + assertEquals("{\"id\":\"parent:child\"}", result); + } +} Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/BuiltinApplicationFactory.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/BuiltinApplicationFactory.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/plugin/config/impl/BuiltinApplicationFactory.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -82,7 +82,6 @@ yuiConfig.put("left.gutter", "0px 0px 5px 10px"); yuiConfig.put("left.width", "460"); yuiConfig.put("left.resize", true); - yuiConfig.put("root.id", "doc3"); config.put("yui.config", yuiConfig); plugins.addPlugin(config); Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/util/PluginConfigMapper.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -20,8 +20,8 @@ import java.util.Map; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.PropertyUtils; -import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.apache.commons.beanutils.BeanUtilsBean; +import org.apache.wicket.util.value.IValueMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,16 +33,17 @@ static final Logger log = LoggerFactory.getLogger(PluginConfigMapper.class); - public static void populate(Object bean, IPluginConfig config) throws MappingException { + public static void populate(Object bean, IValueMap config) throws MappingException { try { Map entries = BeanUtils.describe(bean); + BeanUtilsBean bub = BeanUtilsBean.getInstance(); for (Map.Entry entry : entries.entrySet()) { if ("class".equals(entry.getKey())) { continue; } String configKey = toConfigKey(entry.getKey()); if (config.containsKey(configKey)) { - PropertyUtils.setSimpleProperty(bean, entry.getKey(), config.get(configKey)); + bub.setProperty(bean, entry.getKey(), config.get(configKey)); } } } catch (IllegalAccessException e) { Modified: hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/frontend/plugins/src/main/java/org/hippoecm/frontend/plugins/console/RootPlugin.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -26,6 +26,8 @@ import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.service.render.RenderService; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; import org.hippoecm.frontend.widgets.Pinger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +55,12 @@ context.unregisterService(this, modelId); } - PageLayoutSettings plSettings = new PageLayoutSettings(config.getPluginConfig("yui.config")); + PageLayoutSettings plSettings = new PageLayoutSettings(); + try { + PluginConfigMapper.populate(plSettings, config.getPluginConfig("yui.config")); + } catch (MappingException e) { + throw new RuntimeException(e); + } add(new PageLayoutBehavior(plSettings)); } Modified: hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml =================================================================== --- hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/frontend/plugins/src/main/resources/frontend-console.xml 2010-03-15 08:26:20 UTC (rev 22126) @@ -244,10 +244,6 @@ id=navigator-center,body=navigator-center-body,scroll=true - - top - center -     Modified: hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java =================================================================== --- hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/frontend/test/src/test/java/org/hippoecm/frontend/util/PluginConfigMapperTest.java 2010-03-15 08:26:20 UTC (rev 22126) @@ -49,4 +49,20 @@ assertEquals(true, bean.isTestBool()); assertEquals("value", bean.getTestString()); } + + @Test + public void testStringValues() throws MappingException { + JavaPluginConfig jpc = new JavaPluginConfig(); + jpc.put("test.int", "1"); + jpc.put("test.bool", "true"); + jpc.put("test.string", "value"); + + MappingTestBean bean = new MappingTestBean(); + PluginConfigMapper.populate(bean, jpc); + + assertEquals(1, bean.getTestInt()); + assertEquals(true, bean.isTestBool()); + assertEquals("value", bean.getTestString()); + } + } Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-15 08:26:20 UTC (rev 22126) @@ -66,10 +66,6 @@ browse-perspective-wrapper - - left - center - @@ -142,26 +138,21 @@ frontend:pluginconfig - - id=navigator-center,body=navigator-center-body,width=250 + + id=navigator-top,height=25px,resize=false id=navigator-left,body=navigator-left-body,width=200,zindex=2,resize=true + + id=navigator-center,body=navigator-center-body,width=250 + true navigator-wrapper - - id=navigator-top,height=25px,resize=false - - - top - left - center - @@ -321,8 +312,11 @@ frontend:pluginconfig + + id=tabbed-panel-layout-top,height=25,gutter=0px 0px 0px 0px + - tabbed-panel-layout-center + id=tabbed-panel-layout-center,gutter=0px 0px 0px 0px true @@ -330,13 +324,6 @@ tabbed-panel-layout - - tabbed-panel-layout-top - - - top - center - @@ -352,17 +339,9 @@ org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - - frontend:pluginconfig - - - gutter=0px 0px 0px 0px - - - center - - + + center + @@ -377,17 +356,9 @@ org.hippoecm.frontend.plugins.yui.layout.UnitPlugin - - - frontend:pluginconfig - - - height=25,gutter=0px 0px 0px 0px - - - top - - + + top + Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-dashboard.xml 2010-03-15 08:26:20 UTC (rev 22126) @@ -86,12 +86,6 @@ dashboard-perspective-wrapper - - top - left - center - right - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-15 08:26:20 UTC (rev 22126) @@ -80,12 +80,8 @@ editor-perspective-wrapper - id=editor-perspective-top,height=24,zindex=1 + id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 - - top - center - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-15 08:26:20 UTC (rev 22126) @@ -71,12 +71,8 @@ editor-perspective-wrapper - id=editor-perspective-top,height=24,zindex=1 + id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 - - top - center - Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-14 07:21:20 UTC (rev 22125) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-static.xml 2010-03-15 08:26:20 UTC (rev 22126) @@ -397,9 +397,6 @@ frontend:plugin - - service.center - org.hippoecm.frontend.plugins.cms.root.RootPlugin @@ -426,29 +423,15 @@ ie - - - frontend:pluginconfig - - - 0px 0px 0px 0px - - - 0px 0px 0px 0px - - - 50 - - frontend:pluginconfig - tabbed-panel-layout-center + id=tabbed-panel-layout-center,height=1000 - tabbed-panel-layout-left + id=tabbed-panel-layout-left,width=50 true @@ -456,33 +439,7 @@ tabbed-panel-layout - - left - center - - - - frontend:pluginconfig - - - height=1000 - - - center - - - - - frontend:pluginconfig - - - width=50 - - - left - - @@ -542,10 +499,6 @@ id=hippo-controlpanel-perspective-top,body=hippo-controlpanel-perspective-top-body,height=35 - - top - center - From helpdesk at onehippo.com Mon Mar 15 09:44:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Mon Mar 15 09:49:29 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3869) StringCodecFactory issues In-Reply-To: <15176016.820.1266960110389.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <4318742.4098.1268642688620.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3869?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86742#action_86742 ] Berry van Halderen commented on HREPTWO-3869: --------------------------------------------- I'm about to improve the handling of the codec loading. It is however a even bigger structural change, where the codecs can now be properly cached, and configured in just a single location. This does mean that it does not look that the patch was applied, however that is just appearance. All/most issues from the patch have been addressed as most issues are valid. Here's my response to the issues: Ad 1) direct use of Class.forName introduces potential class loading issues It is not actually that much of a problem as the whole cms needs to be loaded from a single class context. However the class loading will now be done through the class context loader. Ad 2] any exception that could occur loading a StringCodec class or instantiating it, are silently swallowed, returning null The loading of the classes in no longer part of the implementation in the API, but instead of a separate service. This service will output errors to the log file Ad 3] StringCodecs class definitions are reloaded on each 'getStringCodec(String ...)' call, introducing a performance hit >From the original, this is a necessity as the factory needed to be re-instantiated again and again. This because it needs to detached in wicket. The new implementation does however allow for a single instance of the factory as it is now supported through a separate service. Ad 4] 'getStringCodec()' method is unused and even when called would produce NullPointerException The implementation using the service new allows for the usable of a fallback encoding. This was the original design in the implementation, but can now actually be used. Ad 5] missing documentation More documentation added, more to follow. Ad 6] missing behavior change detectors (tests) Some tests are added to a different package, but not the the API package, those should be as lean as possible. Thank you for your feedback, it helps putting the improvements into place. > StringCodecFactory issues > ------------------------- > > Key: HREPTWO-3869 > URL: http://issues.onehippo.com/browse/HREPTWO-3869 > Project: Hippo Repository 2 > Issue Type: Improvement > Components: repository-interface > Affects Versions: r2.12.04 > Reporter: Rob van der Linden Vooren > Assignee: Berry van Halderen > Priority: High > Fix For: r2.13.00 > > Attachments: StringCodecFactory-rev21850.zip > > > StringCodecFactory was introduced to support readable urls and is currently used in core Hippo CMS Plugins. > Our project relies on this infrastructure factory in order to hook up our custom naming scheme. > In the process of implementing the custom naming scheme, I found some issues with the current implementation as mentioned below. > 1] direct use of Class.forName introduces potential class loading issues > 2] any exception that could occur loading a StringCodec class or instantiating it, are silently swallowed, returning null > 3] StringCodecs class definitions are reloaded on each 'getStringCodec(String ...)' call, introducing a performance hit > 4] 'getStringCodec()' method is unused and even when called would produce NullPointerException > 5] missing documentation > 6] missing behavior change detectors (tests) > I have addressed these issues in the patch attached (for trunk, rev 21850). > Please review. > Kind regards, > Rob van der Linden Vooren -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 15 09:57:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 15 10:02:29 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3945) check mime type upon image/asset upload In-Reply-To: <425081.7404.1267786910307.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22573932.4120.1268643468595.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3945?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3945: --------------------------------------- Assignee: Berry van Halderen (was: Sylvain P?lissier) > check mime type upon image/asset upload > --------------------------------------- > > Key: HREPTWO-3945 > URL: http://issues.onehippo.com/browse/HREPTWO-3945 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Berry van Halderen > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 15 10:30:49 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 15 10:35:31 2010 Subject: [HippoRepos-dev] [22127] hippo-ecm/trunk: HREPTWO-16: add replication package to logged warnings Message-ID: <20100315093049.92F521C021@svn.vm.castaserver.com> Revision: 22127 Author: bvanhalderen Date: 2010-03-15 10:30:49 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-16: add replication package to logged warnings Modified Paths: -------------- hippo-ecm/trunk/package/war/jetty-config/log4j.xml hippo-ecm/trunk/quickstart/bin/src/main/resources/log4j.xml hippo-ecm/trunk/quickstart/war/src/main/resources/log4j.xml hippo-ecm/trunk/repository/application/jetty-config/log4j.xml Modified: hippo-ecm/trunk/package/war/jetty-config/log4j.xml =================================================================== --- hippo-ecm/trunk/package/war/jetty-config/log4j.xml 2010-03-15 08:26:20 UTC (rev 22126) +++ hippo-ecm/trunk/package/war/jetty-config/log4j.xml 2010-03-15 09:30:49 UTC (rev 22127) @@ -96,6 +96,10 @@ + + + + Modified: hippo-ecm/trunk/quickstart/bin/src/main/resources/log4j.xml =================================================================== --- hippo-ecm/trunk/quickstart/bin/src/main/resources/log4j.xml 2010-03-15 08:26:20 UTC (rev 22126) +++ hippo-ecm/trunk/quickstart/bin/src/main/resources/log4j.xml 2010-03-15 09:30:49 UTC (rev 22127) @@ -92,6 +92,10 @@ + + + + Modified: hippo-ecm/trunk/quickstart/war/src/main/resources/log4j.xml =================================================================== --- hippo-ecm/trunk/quickstart/war/src/main/resources/log4j.xml 2010-03-15 08:26:20 UTC (rev 22126) +++ hippo-ecm/trunk/quickstart/war/src/main/resources/log4j.xml 2010-03-15 09:30:49 UTC (rev 22127) @@ -92,6 +92,10 @@ + + + + Modified: hippo-ecm/trunk/repository/application/jetty-config/log4j.xml =================================================================== --- hippo-ecm/trunk/repository/application/jetty-config/log4j.xml 2010-03-15 08:26:20 UTC (rev 22126) +++ hippo-ecm/trunk/repository/application/jetty-config/log4j.xml 2010-03-15 09:30:49 UTC (rev 22127) @@ -96,6 +96,10 @@ + + + + From schans at onehippo.com Mon Mar 15 10:42:32 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 10:42:33 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_became_unstable=3A__Hipp?= =?utf-8?q?o_ECM_Trunk_=C2=BB_Xinha_addon_frontend_plugin_test_=231189?= Message-ID: <3016473.01268646152514.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Mon Mar 15 10:42:34 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 10:42:36 2010 Subject: [HippoRepos-dev] Hudson build became unstable: Hippo ECM Trunk #1189 Message-ID: <4599273.11268646154716.JavaMail.hudson@hudson.onehippo.org> See From svn-logs at hippocms.org Mon Mar 15 11:18:23 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 15 11:23:06 2010 Subject: [HippoRepos-dev] [22128] hippo-ecm/trunk: HREPTWO-3869: Message-ID: <20100315101823.804B81C020@svn.vm.castaserver.com> Revision: 22128 Author: bvanhalderen Date: 2010-03-15 11:18:22 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-3869: - instead of customizing the encoders at a workflow level, a central configuration is used at /hippo:configuration/hippo:frontend/cms/cms-services/settingsService/codecs - introduction of a settingsService that can contain globally non-user specific settings, such as the StringCodecFactory - usages of symbolic names of string codecs - by default use a fallback of ident encoding in the cms - upgrade warning that the old (never documented) way to override encodings using encoding.display and encoding.node at workflow level is no longer supported - documentation en StringCodec classes - added Rob van der Linden Vooren as contributer. Modified Paths: -------------- hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java hippo-ecm/trunk/addon/builtin/test/src/test/java/org/hippoecm/repository/StringCodecTest.java hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog.java hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DefaultWorkflowPlugin.java hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/ISO9075Helper.java hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodec.java hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java hippo-ecm/trunk/package/config/src/main/resources/cms-services.xml hippo-ecm/trunk/pom.xml hippo-ecm/trunk/repository/upgrade/pom.xml Added Paths: ----------- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/ISettingsService.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/settings/ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/settings/SettingsStorePlugin.java hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java Modified: hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -59,6 +59,7 @@ import org.hippoecm.frontend.service.IBrowseService; import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.IEditorManager; +import org.hippoecm.frontend.service.ISettingsService; import org.hippoecm.frontend.service.ServiceException; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.frontend.widgets.AbstractView; @@ -361,15 +362,15 @@ } protected StringCodec getLocalizeCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = getPluginConfig().getString("encoding.display", "org.hippoecm.repository.api.StringCodecFactory$IdentEncoding"); - return stringCodecFactory.getStringCodec(encoder); + ISettingsService settingsService = getPluginContext().getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.display"); } protected StringCodec getNodeNameCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = getPluginConfig().getString("encoding.node", "org.hippoecm.repository.api.StringCodecFactory$UriEncoding"); - return stringCodecFactory.getStringCodec(encoder); + ISettingsService settingsService = getPluginContext().getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.node"); } public class AddDocumentDialog extends WorkflowAction.WorkflowDialog { Modified: hippo-ecm/trunk/addon/builtin/test/src/test/java/org/hippoecm/repository/StringCodecTest.java =================================================================== --- hippo-ecm/trunk/addon/builtin/test/src/test/java/org/hippoecm/repository/StringCodecTest.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/addon/builtin/test/src/test/java/org/hippoecm/repository/StringCodecTest.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -15,6 +15,8 @@ */ package org.hippoecm.repository; +import java.util.Map; +import java.util.TreeMap; import org.hippoecm.repository.api.StringCodec; import org.hippoecm.repository.api.StringCodecFactory; @@ -32,6 +34,7 @@ private final static String SVN_ID = "$Id$"; Node root, node; + StringCodecFactory factory; @Before @Override @@ -42,6 +45,9 @@ root.getNode("test").remove(); root = root.addNode("test"); session.save(); + Map codecs = new TreeMap(); + codecs.put("encoding.node", new StringCodecFactory.UriEncoding()); + factory = new StringCodecFactory(codecs); } @After @@ -55,8 +61,7 @@ @Test public void testNodeNameCodec() throws RepositoryException { - StringCodecFactory factory = new StringCodecFactory(); - StringCodec codec = factory.getStringCodec("org.hippoecm.repository.api.StringCodecFactory$UriEncoding"); + StringCodec codec = factory.getStringCodec("encoding.node"); assertNotNull(codec); StringBuffer sb; for (int ch = 0; ch < 255; ch++) { Modified: hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog.java =================================================================== --- hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/addon/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/upload/UploadDialog.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -29,6 +29,7 @@ import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.gallery.Gallery; +import org.hippoecm.frontend.service.ISettingsService; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.repository.api.StringCodec; import org.hippoecm.repository.api.StringCodecFactory; @@ -70,16 +71,16 @@ return workflowCats; } - StringCodec getLocalizeCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = pluginConfig.getString("encoding.display", "org.hippoecm.repository.api.StringCodecFactory$IdentEncoding"); - return stringCodecFactory.getStringCodec(encoder); + protected StringCodec getLocalizeCodec() { + ISettingsService settingsService = pluginContext.getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.display"); } - StringCodec getNodeNameCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = pluginConfig.getString("encoding.node", "org.hippoecm.repository.api.StringCodecFactory$UriEncoding"); - return stringCodecFactory.getStringCodec(encoder); + protected StringCodec getNodeNameCodec() { + ISettingsService settingsService = pluginContext.getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.node"); } IWizardModel getWizardModel() { Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DefaultWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DefaultWorkflowPlugin.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DefaultWorkflowPlugin.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -44,6 +44,7 @@ import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.IEditorManager; import org.hippoecm.frontend.service.IEditor.Mode; +import org.hippoecm.frontend.service.ISettingsService; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.repository.api.Document; import org.hippoecm.repository.api.HippoNode; @@ -257,17 +258,15 @@ } protected StringCodec getLocalizeCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = getPluginConfig().getString("encoding.display", - "org.hippoecm.repository.api.StringCodecFactory$IdentEncoding"); - return stringCodecFactory.getStringCodec(encoder); + ISettingsService settingsService = getPluginContext().getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.display"); } protected StringCodec getNodeNameCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = getPluginConfig().getString("encoding.node", - "org.hippoecm.repository.api.StringCodecFactory$UriEncoding"); - return stringCodecFactory.getStringCodec(encoder); + ISettingsService settingsService = getPluginContext().getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.node"); } @Override Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -56,6 +56,7 @@ import org.hippoecm.frontend.service.IBrowseService; import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.IEditorManager; +import org.hippoecm.frontend.service.ISettingsService; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.repository.api.Document; import org.hippoecm.repository.api.HippoNode; @@ -466,17 +467,15 @@ } protected StringCodec getLocalizeCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = getPluginConfig().getString("encoding.display", - "org.hippoecm.repository.api.StringCodecFactory$IdentEncoding"); - return stringCodecFactory.getStringCodec(encoder); + ISettingsService settingsService = getPluginContext().getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.display"); } protected StringCodec getNodeNameCodec() { - StringCodecFactory stringCodecFactory = new StringCodecFactory(); - String encoder = getPluginConfig().getString("encoding.node", - "org.hippoecm.repository.api.StringCodecFactory$UriEncoding"); - return stringCodecFactory.getStringCodec(encoder); + ISettingsService settingsService = getPluginContext().getService(ISettingsService.SERVICE_ID, ISettingsService.class); + StringCodecFactory stringCodecFactory = settingsService.getStringCodecFactory(); + return stringCodecFactory.getStringCodec("encoding.node"); } @Override Modified: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/ISO9075Helper.java =================================================================== --- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/ISO9075Helper.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/ISO9075Helper.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -27,11 +27,11 @@ private ISO9075Helper() {}; public static String encodeLocalName(String name) { - return new StringCodecFactory().getStringCodec("org.hippoecm.repository.api.StringCodecFactory$ISO9075Helper").encode(name); + return new StringCodecFactory.ISO9075Helper().encode(name); } public static String decodeLocalName(String name) { - return new StringCodecFactory().getStringCodec("org.hippoecm.repository.api.StringCodecFactory$ISO9075Helper").decode(name); + return new StringCodecFactory.ISO9075Helper().decode(name); } /** @deprecrated without replacement */ Modified: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodec.java =================================================================== --- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodec.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodec.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -15,9 +15,29 @@ */ package org.hippoecm.repository.api; +/** + * Strategy interface for encoding and decoding strings. + *

    + * StringCodec objects should not retain state between calls and are therefore reusable. + * Encoding and decoding should also be thread-safe. + */ public interface StringCodec { + /** + * @exclude + */ final static String SVN_ID = "$Id$"; + /** + * Encodes a string of characters. + * @param plain the string to encode + * @return the encoded string + */ public String encode(String plain); + + /** + * Decodes a string of characters. Some encoding strategies are one-way, in which case the decoding might return null. + * @param encoded the previously encoded string + * @return the decoded string or null if no decoding is possible + */ public String decode(String encoded); } Modified: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java =================================================================== --- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -21,41 +21,58 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * The StringCodecFactory allows you access to symbolic named StringCodec's. + * Typically a single instance of the StringCodecFactory is stored in the application framework. + */ public class StringCodecFactory { private Map codecs; + /** + * Initialized a empty StringCodecFactory containing no encodings, always falling back to a no-operation encoding. + * @deprecated use a fully configured StringCodecFactory instead + */ + @Deprecated public StringCodecFactory() { - this.codecs = new HashMap(); + codecs = new HashMap(); + codecs.put(null, new IdentEncoding()); } - StringCodecFactory(Map codecs) { - this.codecs = codecs; + /** + * Initialized a StringCodecFactory with the given and fixed StringCodec mappings. + * @param codecs a map of codecs to bind to their symbolic names. The map becomes immutable. + */ + public StringCodecFactory(Map codecs) { + this.codecs = new HashMap(codecs); // create a private immutable copy of the mapping } + /** + * Requests which encoder to use for the diven symbolic name. + * @param encoding the symbolic name of the encoder that is requested + * @return the stringcodec to use, which might be a fall-back encoder or null if non was defined. + */ public StringCodec getStringCodec(String encoding) { if (codecs.containsKey(encoding)) { return codecs.get(encoding); } else { - try { - Class clazz = Class.forName(encoding).asSubclass(StringCodec.class); - return clazz.newInstance(); - } catch (InstantiationException ex) { - return null; - } catch (IllegalAccessException ex) { - return null; - } catch (ClassCastException ex) { - return null; - } catch (ClassNotFoundException ex) { - return null; - } + return codecs.get(null); } } + /** + * Requests the default encoder to use. + * @return returns the fall-back or default encoder to use, or null if non was defined. + */ public StringCodec getStringCodec() { return codecs.get(null); } - public static class IdentEncoding implements StringCodec { + /** + * Usage of this class discouraged. If should only be used by frameworks to initialize the StringCodecFactory instance. + *

    + * Performs an identical encoding, i.e. returns an identical string for encoding and decoding. + */ + public final static class IdentEncoding implements StringCodec { public String encode(String plain) { return plain; } @@ -65,6 +82,12 @@ } } + /** + * Usage of this class discouraged. If should only be used by frameworks to initialize the StringCodecFactory instance. + *

    + * Performs a one-way encoding (no decoding possible) for translating any UTF-8 String to a suitable set of characters that can be used in URIs. + * For the algorithm in use see {@link encoding.html} + */ public static class UriEncoding implements StringCodec { public String encode(String utf8) { StringBuffer sb = new StringBuffer(); @@ -204,7 +227,8 @@ sb.append(")"); break; default: - sb.append(chars[i]); + sb.append(Character.toLowerCase(chars[i])); + //sb.append(chars[i]); } } else { switch (chars[i]) { @@ -509,7 +533,9 @@ } /** - *

    Helper class for encoding and decoding (the localname of) Qualified names

    + * Usage of this class discouraged. If should only be used by frameworks to initialize the StringCodecFactory instance. + *

    + * Performs encoding and decoding (the localname of) Qualified names * *

    * Implements the encode and decode routines based on ISO 9075-14:2003.
    @@ -556,20 +582,12 @@ * be represented using the format "{namespaceURI}localPart". */ public static class ISO9075Helper implements StringCodec { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; //private static final char[] realChars = {'/', ':', '[', ']', '*', '\'', '"', '|'}; //private static final String[] realChars = {"/", ":", "[", "]", "*", "'", "\"", "|"}; //private static final String[] encodedChars = {"_x002F_", "_x003A_", '[', ']', "_x002A_", "_x0027_", "_x0022_", "_x007C_"}; private static final String colon = ":"; private static final String colonISO9075 = "_x003A_"; - /** - * Constructor - */ - public ISO9075Helper() { - } - public String encode(String plain) { return encodeLocalName(plain); } @@ -578,20 +596,10 @@ return decodeLocalName(encoded); } - /** - * - * @param name - * @return - */ public static String encodeLocalName(String name) { return encodeColon(encodeImpl(name)); } - /** - * - * @param name - * @return - */ public static String decodeLocalName(String name) { return decodeImpl(name); } Added: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html =================================================================== --- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html (rev 0) +++ hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html 2010-03-15 10:18:22 UTC (rev 22128) @@ -0,0 +1,220 @@ + + + + + Encoding tables for URL names + + + +

    When translating a document name to a url path segment the following + rules are used:

    +
      +
    • Control characters (ASCII / UTF-8 / ISO/IEC 8859-1 codes below 0x1f and + between 0x80 and 0x9f such as tabs, carriage return, line feeds, + end-of-text, bell, etcetera) are removed;
      • +
    • A non brakable space is converted into a regular space;
      • +
    • Multiple spaces are merged into a single space;
      • +
    • Spaces are converted to hyphens;
      • +
    • All common printable characters (ASCII / UTF-8 / ISO/IEC 8859-1 + codes in the range 0x21 and 0x7f) are are used as-is, unless there + is a replacement as specified in table 1. +
    • Other special characters (ASCII / UTF-8 / ISO/IEC 8859-1 codes not + in the range 0x21 and 0x7f) that are not listed in table 2 or table 3 + are removed, including similar characters from non latin-1 tables;
      • +
    • leading spaces and ending spaces are removed.
      • +
    +

    The following translation tables for printable characters are used:

    +
    + + + + + + + + + + + + + + + + +
    table 1: special handling of some regular printable characters
    "removed
    $removed
    &removed
    'removed
    *converted into space
    +converted into hyphen removing leading and adding ending space
    ,removed
    /converted into hyphen
    :converted into hyphen removing leading and adding ending space
    ;converted into hyphen removing leading and adding ending space
    =-
    ?removed
    @-at-
    [(
    ])
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    table 2: ISO 8859-1 special characters
    ¡!
    ¢ct
    £GBP
    ¤removed
    ¥yen
    ¦|
    §removed
    ¨removed
    ©(c)
    ªremoved
    «(
    ¬not
    ­ -
    ®(r)
    ¯-
    °o
    ±-
    ²^2
    ³^3
    ´removed
    µu
    )
    ·.
    ¸removed
    ¹1
    ºo
    »)
    ¼1-4
    ½1-2
    ¾3-4
    Ðd
    ØO
    ÙU
    ÚU
    ÛU
    ÜU
    ÝY
    ÞY
    ßss
    àa
    áa
    âa
    ãa
    äa
    åa
    æae
    çc
    èe
    ée
    êe
    ëe
    ìi
    íi
    îi
    ïi
    ðd
    ñn
    òo
    óo
    ôo
    õo
    öo
    ÷-
    øo
    ùu
    úu
    ûu
    üu
    ýu
    þy
    ÿy
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    table 3: translation of UTF-8 Latin 1 characters above 0xc200
    UTF-8 c2a1!
    UTF-8 c2a2ct
    UTF-8 c2a3GBP
    UTF-8 c2a4removed
    UTF-8 c2a5yen
    UTF-8 c2a6|
    UTF-8 c2a7removed
    UTF-8 c2a8removed
    UTF-8 c2a9(c)
    UTF-8 c2aaremoved
    UTF-8 c2ab(
    UTF-8 c2acnot
    UTF-8 c2ad-
    UTF-8 c2ae(r)
    UTF-8 c2af-
    UTF-8 c2b0o
    UTF-8 c2b1plusminus
    UTF-8 c2b2^2
    UTF-8 c2b3^3
    UTF-8 c2b4removed
    UTF-8 c2b5u
    UTF-8 c2b6)
    UTF-8 c2b7.
    UTF-8 c2b8removed
    UTF-8 c2b91
    UTF-8 c2bao
    UTF-8 c2bb)
    UTF-8 c2bc1-4
    UTF-8 c2bd1-2
    UTF-8 c2be3-4
    UTF-8 c2bfremoved
    UTF-8 c380A
    UTF-8 c381A
    UTF-8 c382A
    UTF-8 c383A
    UTF-8 c384A
    UTF-8 c385A
    UTF-8 c386AE
    UTF-8 c387C
    UTF-8 c388E
    UTF-8 c389E
    UTF-8 c38aE
    UTF-8 c38bE
    UTF-8 c38cI
    UTF-8 c38dI
    UTF-8 c38eI
    UTF-8 c38fI
    UTF-8 c390D
    UTF-8 c391N
    UTF-8 c392O
    UTF-8 c393O
    UTF-8 c394O
    UTF-8 c395O
    UTF-8 c396O
    UTF-8 c397x
    UTF-8 c398O
    UTF-8 c399U
    UTF-8 c39aU
    UTF-8 c39bU
    UTF-8 c39cU
    UTF-8 c39dY
    UTF-8 c39eY
    UTF-8 c39fss
    UTF-8 c3a0a
    UTF-8 c3a1a
    UTF-8 c3a2a
    UTF-8 c3a3a
    UTF-8 c3a4a
    UTF-8 c3a5a
    UTF-8 c3a6ae
    UTF-8 c3a7c
    UTF-8 c3a8e
    UTF-8 c3a9e
    UTF-8 c3aae
    UTF-8 c3abe
    UTF-8 c3aci
    UTF-8 c3adi
    UTF-8 c3aei
    UTF-8 c3afi
    UTF-8 c3b0d
    UTF-8 c3b1n
    UTF-8 c3b2o
    UTF-8 c3b3o
    UTF-8 c3b4o
    UTF-8 c3b5o
    UTF-8 c3b6o
    UTF-8 c3b7-
    UTF-8 c3b8o
    UTF-8 c3b9u
    UTF-8 c3bau
    UTF-8 c3bbu
    UTF-8 c3bcu
    UTF-8 c3bdy
    UTF-8 c3bey
    UTF-8 c3bfy
    + + Property changes on: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/ISettingsService.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/ISettingsService.java (rev 0) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/ISettingsService.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -0,0 +1,30 @@ +/* + * Copyright 2010 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.service; + +import org.apache.wicket.IClusterable; +import org.hippoecm.repository.api.StringCodecFactory; + +/** + * The settings service provides plugin access to global settings and factories. + */ +public interface ISettingsService extends IClusterable { + final static String SVN_ID = "$Id$"; + + String SERVICE_ID = "service.settings"; + + public StringCodecFactory getStringCodecFactory(); +} Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/ISettingsService.java ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/settings/SettingsStorePlugin.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/settings/SettingsStorePlugin.java (rev 0) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/settings/SettingsStorePlugin.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -0,0 +1,71 @@ +/* + * Copyright 2010 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.service.settings; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import org.hippoecm.frontend.service.ISettingsService; +import org.hippoecm.frontend.service.preferences.*; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.Plugin; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.repository.api.StringCodec; +import org.hippoecm.repository.api.StringCodecFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SettingsStorePlugin extends Plugin implements ISettingsService { + private static final long serialVersionUID = 1L; + @SuppressWarnings("unused") + + private final static String SVN_ID = "$Id$"; + + static final Logger log = LoggerFactory.getLogger(SettingsStorePlugin.class); + + transient StringCodecFactory stringCodecFactory; + + public SettingsStorePlugin(IPluginContext context, IPluginConfig config) { + super(context, config); + + context.registerService(this, ISettingsService.SERVICE_ID); + } + + public StringCodecFactory getStringCodecFactory() { + if (stringCodecFactory == null) { + IPluginConfig codecsConfig = getPluginConfig().getPluginConfig("codecs"); + Map codecs = new HashMap(); + for (String codecName : codecsConfig.keySet()) { + try { + String className = codecsConfig.getString(codecName); + Class clazz = Thread.currentThread().getContextClassLoader().loadClass(className).asSubclass(StringCodec.class); + codecs.put(codecName, clazz.newInstance()); + } catch (InstantiationException ex) { + log.error("unable to create " + codecName, ex); + } catch (IllegalAccessException ex) { + log.error("unable to create " + codecName, ex); + } catch (ClassCastException ex) { + log.error("1`unable to create " + codecName, ex); + } catch (ClassNotFoundException ex) { + log.error("unable to create " + codecName, ex); + } + } + codecs.put(null, new StringCodecFactory.IdentEncoding()); + stringCodecFactory = new StringCodecFactory(codecs); + } + return stringCodecFactory; + } +} Property changes on: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/settings/SettingsStorePlugin.java ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-services.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-services.xml 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-services.xml 2010-03-15 10:18:22 UTC (rev 22128) @@ -34,4 +34,24 @@ + + + frontend:plugin + + + org.hippoecm.frontend.service.settings.SettingsStorePlugin + + + + frontend:pluginconfig + + + org.hippoecm.repository.api.StringCodecFactory$UriEncoding + + + org.hippoecm.repository.api.StringCodecFactory$IdentEncoding + + + + Modified: hippo-ecm/trunk/pom.xml =================================================================== --- hippo-ecm/trunk/pom.xml 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/pom.xml 2010-03-15 10:18:22 UTC (rev 22128) @@ -251,6 +251,15 @@ +1 + + Rob van der Linden Vooren + JTeam + http://www.jteam.nl/ + + External contributor + + +1 + Modified: hippo-ecm/trunk/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/trunk/repository/upgrade/pom.xml 2010-03-15 09:30:49 UTC (rev 22127) +++ hippo-ecm/trunk/repository/upgrade/pom.xml 2010-03-15 10:18:22 UTC (rev 22128) @@ -67,7 +67,7 @@ true - org.hippoecm.repository.upgrade.Upgrader12a + org.hippoecm.repository.upgrade.Upgrader12a org.hippoecm.repository.upgrade.Upgrader13a Added: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java =================================================================== --- hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java (rev 0) +++ hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java 2010-03-15 10:18:22 UTC (rev 22128) @@ -0,0 +1,78 @@ +/* + * Copyright 2009 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.upgrade; + +import java.io.InputStreamReader; +import java.util.Calendar; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.jcr.Node; +import javax.jcr.NodeIterator; +import javax.jcr.Property; +import javax.jcr.RepositoryException; +import javax.jcr.Value; +import javax.jcr.query.Query; + +import org.hippoecm.repository.api.HippoSession; +import org.hippoecm.repository.ext.UpdaterContext; +import org.hippoecm.repository.ext.UpdaterItemVisitor; +import org.hippoecm.repository.ext.UpdaterModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Upgrader13a implements UpdaterModule { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + static final Logger log = LoggerFactory.getLogger(Upgrader13a.class); + + public void register(final UpdaterContext context) { + context.registerName("upgrade-v13a"); + context.registerStartTag("v12a"); + context.registerEndTag("v13a"); + context.registerVisitor(new UpdaterItemVisitor.NodeTypeVisitor("rep:root") { + @Override + protected void leaving(final Node node, int level) throws RepositoryException { + /* + * The removal of the entire /hippo:log tree seems to be appropriate. This is relatively volatile data as + * this is a sliding log file with the oldest entries being removed automatically. Combine this with the + * fact that old entries might not contain the same information and the effort of converting data which is + * going to be removed quickly is unnecessary. + */ + if (node.hasNode("hippo:log")) { + for(NodeIterator iter=node.getNode("hippo:log").getNodes(); iter.hasNext(); ) { + iter.nextNode().remove(); + } + } + } + }); + + context.registerVisitor(new UpdaterItemVisitor.QueryVisitor("//element(*,frontend:pluginconfig)[@encoding.node] != '']", Query.XPATH) { + @Override + protected void leaving(Node node, int level) throws RepositoryException { + log.error("encoding.node property on "+node.getPath()+" no longer supported, please set /hippo:configuration/hippo:frontend/cms/cms-services/settingsService/codecs/@encoding.node property instead"); + } + }); + + context.registerVisitor(new UpdaterItemVisitor.QueryVisitor("//element(*,frontend:pluginconfig)[@encoding.display] != '']", Query.XPATH) { + @Override + protected void leaving(Node node, int level) throws RepositoryException { + log.error("encoding.dos[;ay property on "+node.getPath()+" no longer supported, please set /hippo:configuration/hippo:frontend/cms/cms-services/settingsService/codecs/@encoding.display property instead"); + } + }); + } +} Property changes on: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native From svn-logs at hippocms.org Mon Mar 15 11:19:56 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 15 11:24:38 2010 Subject: [HippoRepos-dev] [22129] hippo-ecm: HREPTWO-16; update version information for netbeans Message-ID: <20100315101956.3531D1C020@svn.vm.castaserver.com> Revision: 22129 Author: bvanhalderen Date: 2010-03-15 11:19:55 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-16; update version information for netbeans Modified Paths: -------------- hippo-ecm/trunk/quickstart/bin/nbactions.xml hippo-ecm/trunk/quickstart/bin/src/main/java/org/hippoecm/Main.java Added Paths: ----------- hippo-ecm/trunk/quickstart/war/src/main/webapp/WEB-INF/sun-web.xml Modified: hippo-ecm/trunk/quickstart/bin/nbactions.xml =================================================================== --- hippo-ecm/trunk/quickstart/bin/nbactions.xml 2010-03-15 10:18:22 UTC (rev 22128) +++ hippo-ecm/trunk/quickstart/bin/nbactions.xml 2010-03-15 10:19:55 UTC (rev 22129) @@ -7,7 +7,7 @@ org.codehaus.mojo:exec-maven-plugin:1.1:exec - -classpath %classpath org.hippoecm.Main ../war/target/hippo-ecm-quickstart-war-2.10.00-SNAPSHOT.war + -classpath %classpath org.hippoecm.Main ../../war/target/hippo-ecm-quickstart-war-2.13.00-SNAPSHOT.war target java @@ -19,7 +19,7 @@ org.codehaus.mojo:exec-maven-plugin:1.1:exec - -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.hippoecm.Main ../war/target/hippo-ecm-quickstart-war-2.10.00-SNAPSHOT.war + -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.hippoecm.Main ../../war/target/hippo-ecm-quickstart-war-2.13.00-SNAPSHOT.war target true java @@ -32,7 +32,7 @@ org.codehaus.mojo:exec-maven-plugin:1.1.1:exec - ${profiler.args} -classpath %classpath org.hippoecm.Main ../war/target/hippo-ecm-quickstart-war-2.10.00-SNAPSHOT.war + ${profiler.args} -classpath %classpath org.hippoecm.Main ../../war/target/hippo-ecm-quickstart-war-2.13.00-SNAPSHOT.war profile ${profiler.java} Modified: hippo-ecm/trunk/quickstart/bin/src/main/java/org/hippoecm/Main.java =================================================================== --- hippo-ecm/trunk/quickstart/bin/src/main/java/org/hippoecm/Main.java 2010-03-15 10:18:22 UTC (rev 22128) +++ hippo-ecm/trunk/quickstart/bin/src/main/java/org/hippoecm/Main.java 2010-03-15 10:19:55 UTC (rev 22129) @@ -49,7 +49,7 @@ } public static void main(String[] args) { - String warFile = "../war/target/hippo-ecm-quickstart-war-2.12.03-SNAPSHOT.war"; + String warFile = "../war/target/hippo-ecm-quickstart-war-2.13.00-SNAPSHOT.war"; if (args.length > 0) { warFile = args[0]; } Added: hippo-ecm/trunk/quickstart/war/src/main/webapp/WEB-INF/sun-web.xml =================================================================== --- hippo-ecm/trunk/quickstart/war/src/main/webapp/WEB-INF/sun-web.xml (rev 0) +++ hippo-ecm/trunk/quickstart/war/src/main/webapp/WEB-INF/sun-web.xml 2010-03-15 10:19:55 UTC (rev 22129) @@ -0,0 +1,11 @@ + + + + / + + + + Keep a copy of the generated servlet class' java code. + + + Property changes on: hippo-ecm/trunk/quickstart/war/src/main/webapp/WEB-INF/sun-web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native From schans at onehippo.com Mon Mar 15 11:54:46 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 11:54:46 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_stable_=3A_Hi?= =?utf-8?q?ppo_ECM_Trunk_=C2=BB_Xinha_addon_frontend_plugin_test_=231190?= In-Reply-To: <3016473.01268646152514.JavaMail.hudson@hudson.onehippo.org> References: <3016473.01268646152514.JavaMail.hudson@hudson.onehippo.org> Message-ID: <8913634.21268650486548.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Mon Mar 15 11:54:48 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 11:54:50 2010 Subject: [HippoRepos-dev] Hudson build is back to stable : Hippo ECM Trunk #1190 In-Reply-To: <4599273.11268646154716.JavaMail.hudson@hudson.onehippo.org> References: <4599273.11268646154716.JavaMail.hudson@hudson.onehippo.org> Message-ID: <21524873.31268650488694.JavaMail.hudson@hudson.onehippo.org> See From svn-logs at hippocms.org Mon Mar 15 12:19:50 2010 From: svn-logs at hippocms.org (bvdschans) Date: Mon Mar 15 12:24:32 2010 Subject: [HippoRepos-dev] [22130] hippo-ecm: HREPTWO-16: Tweak replication logging Message-ID: <20100315111950.340B91C020@svn.vm.castaserver.com> Revision: 22130 Author: bvdschans Date: 2010-03-15 12:19:49 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-16: Tweak replication logging Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java 2010-03-15 10:19:55 UTC (rev 22129) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java 2010-03-15 11:19:49 UTC (rev 22130) @@ -131,7 +131,7 @@ */ final synchronized public void replicate(ChangeLogRecord record) throws RecoverableReplicationException, FatalReplicationException { - log.info("Replicator '{}': start replication of revision {}.", getId(), record.getRevision()); + log.debug("Replicator '{}': start replication of revision {}.", getId(), record.getRevision()); stack.clear(); exclusionCache.clear(); @@ -146,7 +146,7 @@ disconnect(); - log.info("Replicator '{}': replicated revision {}.", getId(), record.getRevision()); + log.debug("Replicator '{}': replicated revision {}.", getId(), record.getRevision()); } /** Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java 2010-03-15 10:19:55 UTC (rev 22129) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java 2010-03-15 11:19:49 UTC (rev 22130) @@ -128,7 +128,7 @@ log.debug("(Re)connecting to Hippo Repository at '{}'.", getRepositoryAddress()); HippoRepository repository = HippoRepositoryFactory.getHippoRepository(getRepositoryAddress()); session = repository.login(getUsername(), getPassword().toCharArray()); - log.info("Connected to Hippo Repository at '{}'.", getRepositoryAddress()); + log.debug("Connected to Hippo Repository at '{}'.", getRepositoryAddress()); } session.refresh(false); return session; From svn-logs at hippocms.org Mon Mar 15 12:21:57 2010 From: svn-logs at hippocms.org (bvdschans) Date: Mon Mar 15 12:26:39 2010 Subject: [HippoRepos-dev] [22131] hippo-ecm: HREPTWO-16: Tweak logging Message-ID: <20100315112157.3229F1C020@svn.vm.castaserver.com> Revision: 22131 Author: bvdschans Date: 2010-03-15 12:21:56 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-16: Tweak logging Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java 2010-03-15 11:19:49 UTC (rev 22130) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/AbstractReplicator.java 2010-03-15 11:21:56 UTC (rev 22131) @@ -131,7 +131,7 @@ */ final synchronized public void replicate(ChangeLogRecord record) throws RecoverableReplicationException, FatalReplicationException { - log.info("Replicator '{}': start replication of revision {}.", getId(), record.getRevision()); + log.debug("Replicator '{}': start replication of revision {}.", getId(), record.getRevision()); stack.clear(); exclusionCache.clear(); @@ -146,7 +146,7 @@ disconnect(); - log.info("Replicator '{}': replicated revision {}.", getId(), record.getRevision()); + log.debug("Replicator '{}': replicated revision {}.", getId(), record.getRevision()); } /** Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java 2010-03-15 11:19:49 UTC (rev 22130) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/replicators/JCRReplicator.java 2010-03-15 11:21:56 UTC (rev 22131) @@ -95,6 +95,16 @@ @Override protected void disconnect() { + try { + if (session != null && session.isLive()) { + session.logout(); + log.debug("Disconnecting from Hippo Repository at '{}'.", getRepositoryAddress()); + } + } catch (Exception e) { + log.warn("Error while disconnecting from Hippo Repository: {}.", e); + } finally { + session = null; + } } //------------------------------- Remote Session methods -------------------------// @@ -118,7 +128,7 @@ log.debug("(Re)connecting to Hippo Repository at '{}'.", getRepositoryAddress()); HippoRepository repository = HippoRepositoryFactory.getHippoRepository(getRepositoryAddress()); session = repository.login(getUsername(), getPassword().toCharArray()); - log.info("Connected to Hippo Repository at '{}'.", getRepositoryAddress()); + log.debug("Connected to Hippo Repository at '{}'.", getRepositoryAddress()); } session.refresh(false); return session; From svn-logs at hippocms.org Mon Mar 15 12:29:26 2010 From: svn-logs at hippocms.org (bvdschans) Date: Mon Mar 15 12:34:09 2010 Subject: [HippoRepos-dev] [22132] hippo-ecm: HREPTWO-16: Remove duplicate entry of replication package Message-ID: <20100315112926.62F501C020@svn.vm.castaserver.com> Revision: 22132 Author: bvdschans Date: 2010-03-15 12:29:26 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-16: Remove duplicate entry of replication package Modified Paths: -------------- hippo-ecm/trunk/repository/application/jetty-config/log4j.xml Modified: hippo-ecm/trunk/repository/application/jetty-config/log4j.xml =================================================================== --- hippo-ecm/trunk/repository/application/jetty-config/log4j.xml 2010-03-15 11:21:56 UTC (rev 22131) +++ hippo-ecm/trunk/repository/application/jetty-config/log4j.xml 2010-03-15 11:29:26 UTC (rev 22132) @@ -84,10 +84,6 @@ - - - - From helpdesk at onehippo.com Mon Mar 15 12:29:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 15 12:34:28 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3923) facet sub search nodes only visible for admin In-Reply-To: <19510281.6166.1267631870362.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26435683.4410.1268652588527.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3923?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86804#action_86804 ] Sylvain P?lissier commented on HREPTWO-3923: -------------------------------------------- TEST VERDICT: PASS TEST SUMMARY: Goal - are /content/documents/tags and state visible? Does their childcount differe from 0?: - Role - admin|author|editor|readwrite: YES - Role - readonly|: NO > facet sub search nodes only visible for admin > --------------------------------------------- > > Key: HREPTWO-3923 > URL: http://issues.onehippo.com/browse/HREPTWO-3923 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Frank van Lankvelt > Assignee: Sylvain P?lissier > Fix For: r2.12.07, r2.13.00 > > > The dynamically generated child nodes under a facet search node are visible for neither author nor editor. This applies e.g. to the "state" and "tags" nodes under /content/documents. > What's more, the resultset is also empty (no child nodes, count == 0). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Mon Mar 15 13:05:55 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 13:05:55 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_became_unstable=3A__Hipp?= =?utf-8?q?o_ECM_Trunk_=C2=BB_Builtin_addon_tests_=231191?= Message-ID: <16161783.41268654755996.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Mon Mar 15 13:05:58 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 13:05:59 2010 Subject: [HippoRepos-dev] Hudson build became unstable: Hippo ECM Trunk #1191 Message-ID: <12507666.51268654758488.JavaMail.hudson@hudson.onehippo.org> See From svn-logs at hippocms.org Mon Mar 15 13:21:28 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 15 13:26:10 2010 Subject: [HippoRepos-dev] [22133] hippo-ecm: HREPTWO-3869: repair trunk Message-ID: <20100315122128.544891C020@svn.vm.castaserver.com> Revision: 22133 Author: bvanhalderen Date: 2010-03-15 13:21:28 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-3869: repair trunk Modified Paths: -------------- hippo-ecm/trunk/repository/upgrade/pom.xml hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java Modified: hippo-ecm/trunk/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/trunk/repository/upgrade/pom.xml 2010-03-15 11:29:26 UTC (rev 22132) +++ hippo-ecm/trunk/repository/upgrade/pom.xml 2010-03-15 12:21:28 UTC (rev 22133) @@ -67,7 +67,7 @@ true - org.hippoecm.repository.upgrade.Upgrader12a org.hippoecm.repository.upgrade.Upgrader13a + org.hippoecm.repository.upgrade.Upgrader12a Modified: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java =================================================================== --- hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java 2010-03-15 11:29:26 UTC (rev 22132) +++ hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader13a.java 2010-03-15 12:21:28 UTC (rev 22133) @@ -61,14 +61,14 @@ } }); - context.registerVisitor(new UpdaterItemVisitor.QueryVisitor("//element(*,frontend:pluginconfig)[@encoding.node] != '']", Query.XPATH) { + context.registerVisitor(new UpdaterItemVisitor.QueryVisitor("//element(*,frontend:pluginconfig)[@encoding.node]", Query.XPATH) { @Override protected void leaving(Node node, int level) throws RepositoryException { log.error("encoding.node property on "+node.getPath()+" no longer supported, please set /hippo:configuration/hippo:frontend/cms/cms-services/settingsService/codecs/@encoding.node property instead"); } }); - context.registerVisitor(new UpdaterItemVisitor.QueryVisitor("//element(*,frontend:pluginconfig)[@encoding.display] != '']", Query.XPATH) { + context.registerVisitor(new UpdaterItemVisitor.QueryVisitor("//element(*,frontend:pluginconfig)[@encoding.display]", Query.XPATH) { @Override protected void leaving(Node node, int level) throws RepositoryException { log.error("encoding.dos[;ay property on "+node.getPath()+" no longer supported, please set /hippo:configuration/hippo:frontend/cms/cms-services/settingsService/codecs/@encoding.display property instead"); From helpdesk at onehippo.com Mon Mar 15 14:19:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 15 14:24:28 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3974) dash/hyphen is not supported by the search Message-ID: <30130290.4611.1268659188937.JavaMail.jira@jira.vm.castaserver.com> dash/hyphen is not supported by the search ------------------------------------------ Key: HREPTWO-3974 URL: http://issues.onehippo.com/browse/HREPTWO-3974 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07 Reporter: Sylvain P?lissier You can't search for documents when the search term embeds a dash or hyphen. For example, search for documents containing this-is-it with the help of this-it returns nothing. However, search for documents containing 3*5+8-7=16 with the help of 8-7 returns the document. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 15 14:26:49 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 15 14:31:32 2010 Subject: [HippoRepos-dev] [22134] hippo-ecm/trunk: HREPTWO-2913: added notice for dependencies which were not automatically collected ( because they are probably ant projects). Message-ID: <20100315132649.B50F91C020@svn.vm.castaserver.com> Revision: 22134 Author: bvanhalderen Date: 2010-03-15 14:26:49 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-2913: added notice for dependencies which were not automatically collected (because they are probably ant projects). Modified Paths: -------------- hippo-ecm/trunk/NOTICE.txt hippo-ecm/trunk/api/NOTICE.txt hippo-ecm/trunk/frontend/application/NOTICE.txt hippo-ecm/trunk/frontend/engine/NOTICE.txt hippo-ecm/trunk/frontend/plugins/NOTICE.txt hippo-ecm/trunk/package/ear/src/main/application/META-INF/NOTICE.txt hippo-ecm/trunk/package/war/src/main/webapp/META-INF/NOTICE.txt hippo-ecm/trunk/quickstart/bin/src/main/assembly/NOTICE.txt hippo-ecm/trunk/quickstart/ear/src/main/application/META-INF/NOTICE.txt hippo-ecm/trunk/quickstart/war/src/main/webapp/META-INF/NOTICE.txt hippo-ecm/trunk/repository/application/NOTICE.txt hippo-ecm/trunk/repository/engine/NOTICE.txt hippo-ecm/trunk/repository/jca/NOTICE.txt hippo-ecm/trunk/repository/modules/NOTICE.txt Modified: hippo-ecm/trunk/NOTICE.txt =================================================================== --- hippo-ecm/trunk/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -10,4 +10,43 @@ This product uses the Yahoo! User Interface Library (YUI) developed by Yahoo! (http://developer.yahoo.com/yui/). -For more information see addon/yui/yui-licence.txt \ No newline at end of file +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/api/NOTICE.txt =================================================================== --- hippo-ecm/trunk/api/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/api/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/frontend/application/NOTICE.txt =================================================================== --- hippo-ecm/trunk/frontend/application/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/frontend/application/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/frontend/engine/NOTICE.txt =================================================================== --- hippo-ecm/trunk/frontend/engine/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/frontend/engine/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/frontend/plugins/NOTICE.txt =================================================================== --- hippo-ecm/trunk/frontend/plugins/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/frontend/plugins/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/package/ear/src/main/application/META-INF/NOTICE.txt =================================================================== --- hippo-ecm/trunk/package/ear/src/main/application/META-INF/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/package/ear/src/main/application/META-INF/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -10,4 +10,43 @@ This product uses the Yahoo! User Interface Library (YUI) developed by Yahoo! (http://developer.yahoo.com/yui/). -For more information see addon/yui/yui-licence.txt \ No newline at end of file +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/package/war/src/main/webapp/META-INF/NOTICE.txt =================================================================== --- hippo-ecm/trunk/package/war/src/main/webapp/META-INF/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/package/war/src/main/webapp/META-INF/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -10,4 +10,43 @@ This product uses the Yahoo! User Interface Library (YUI) developed by Yahoo! (http://developer.yahoo.com/yui/). -For more information see addon/yui/yui-licence.txt \ No newline at end of file +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/quickstart/bin/src/main/assembly/NOTICE.txt =================================================================== --- hippo-ecm/trunk/quickstart/bin/src/main/assembly/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/quickstart/bin/src/main/assembly/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -10,4 +10,43 @@ This product uses the Yahoo! User Interface Library (YUI) developed by Yahoo! (http://developer.yahoo.com/yui/). -For more information see addon/yui/yui-licence.txt \ No newline at end of file +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/quickstart/ear/src/main/application/META-INF/NOTICE.txt =================================================================== --- hippo-ecm/trunk/quickstart/ear/src/main/application/META-INF/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/quickstart/ear/src/main/application/META-INF/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -10,4 +10,43 @@ This product uses the Yahoo! User Interface Library (YUI) developed by Yahoo! (http://developer.yahoo.com/yui/). -For more information see addon/yui/yui-licence.txt \ No newline at end of file +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/quickstart/war/src/main/webapp/META-INF/NOTICE.txt =================================================================== --- hippo-ecm/trunk/quickstart/war/src/main/webapp/META-INF/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/quickstart/war/src/main/webapp/META-INF/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -10,4 +10,43 @@ This product uses the Yahoo! User Interface Library (YUI) developed by Yahoo! (http://developer.yahoo.com/yui/). -For more information see addon/yui/yui-licence.txt \ No newline at end of file +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/repository/application/NOTICE.txt =================================================================== --- hippo-ecm/trunk/repository/application/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/repository/application/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/repository/engine/NOTICE.txt =================================================================== --- hippo-ecm/trunk/repository/engine/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/repository/engine/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/repository/jca/NOTICE.txt =================================================================== --- hippo-ecm/trunk/repository/jca/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/repository/jca/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. Modified: hippo-ecm/trunk/repository/modules/NOTICE.txt =================================================================== --- hippo-ecm/trunk/repository/modules/NOTICE.txt 2010-03-15 12:21:28 UTC (rev 22133) +++ hippo-ecm/trunk/repository/modules/NOTICE.txt 2010-03-15 13:26:49 UTC (rev 22134) @@ -6,4 +6,47 @@ License Version 2.0. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the Apache License. Users and redistributors are hereby requested to verify these -conditions and agree upon them. \ No newline at end of file +conditions and agree upon them. + +This product uses the Yahoo! User Interface Library (YUI) developed by +Yahoo! (http://developer.yahoo.com/yui/). +For more information see addon/yui/yui-licence.txt + +This product includes the concurrent library by Doug Lea released into the +public domain. + + +This project includes the library projects pdfbox, jempbox and fontbox +originally released under the BSD licence as developed by Ben Litchfield. + + + + +These projects have been moved to the Apache foundation as of newer versions and +are now available at + +This product includes software Joda-Time developed by Joda.org + + +This project includes software Quartz Enterprise Job Scheduler developed by +OpenSymphony released under the Apache 2.0 license. + + +This project includes JPOX (http://www.jpox.org) distributed under the Apache +License 2.0 (http://www.apache.org/licenses/) and includes software developed +by Erik Bengtson, Andy Jefferson, Michael Grundmann, Joerg von Frantzius and +contributed by Barry Haddow, Marco Schulze, Ralph Ullrich, David Ezzio, +Brendan de Beer, David Eaves, Martin Taal, Tony Lai, Kikuchi Kousuke and +Roland Szabo. +It also includes software developed by the TJDO project +(http://tjdo.sourceforge.net/) + +This product contains an implementation of javax.imageio.ImageWriter developed by +Helma Software (http://dev.helma.org/) licensed under the Helma License +Version 2.0 (the "License"). You may not use this file except in compliance with +the License. A copy of the License is available at http://dev.helma.org/license/ + +This product contains a Java port of a ColorQuantizer implemented by +ImageMagick licensed under the ImageMagick License (the "License"). You may not +use this file except in compliance with the License. A copy of the License is +available at http://www.imagemagick.org/script/license.php. From helpdesk at onehippo.com Mon Mar 15 14:27:50 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Mon Mar 15 14:32:30 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-2913) Include notice files for 6 remaining libraries In-Reply-To: <31939322.5371248855355359.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <171148.4618.1268659670677.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-2913?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86835#action_86835 ] Berry van Halderen commented on HREPTWO-2913: --------------------------------------------- Found the following libraries not present in the automatically collected NOTICE list: commons-io-1.4.jar - Apache project derby-10.2.1.6.jar - Apache project poi-3.0.2-FINAL.jar - Apache project poi-scratchpad-3.0.2-FINAL.jar - Apache project xml-apis-1.3.03.jar - Apache project concurrent-1.3.4.jar - Doug Lea - Public Domain (http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html) jpox-core-1.2.0-beta-3.jar - Apache license with separate NOTICE jdo2-api-2.0.jar - Apache license JDO2 interface, comes with jpox-core joda-time-1.6.jar - Apache License Version 2.0 (http://www.joda.org/) [ added information to NOTICE ] quartz-1.5.2.jar - Apache license released by OpenSymphony [ added information to NOTICE ] fontbox-0.1.0.jar - see pdfbox jempbox-0.2.0.jar - see pdfbox pdfbox-0.7.3.jar - BSD license, now apache project but not the current versions project [ added information to NOTICE file ] Note that all apache projects are already covered by the NOTICE file. In addition two copied pieces of software where discovered, and will be added to the NOTICE file. > Include notice files for 6 remaining libraries > ---------------------------------------------- > > Key: HREPTWO-2913 > URL: http://issues.onehippo.com/browse/HREPTWO-2913 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Berry van Halderen > Fix For: r2.13.00 > > Original Estimate: 4 hours > Remaining Estimate: 4 hours > > Afaik there are 6 libraries that have notice files that are not picked by Maven and we need to include them manually. > Perhaps we can send the owners of the libraries an email asking them to fix the underlying issue. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 15 15:20:46 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 15 15:25:31 2010 Subject: [HippoRepos-dev] [22135] hippo-ecm/trunk: HREPTWO-3869: improve documentation on StringCodec uri encoding. Message-ID: <20100315142046.2B49E1C021@svn.vm.castaserver.com> Revision: 22135 Author: bvanhalderen Date: 2010-03-15 15:20:45 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-3869: improve documentation on StringCodec uri encoding. Modified Paths: -------------- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java hippo-ecm/trunk/pom.xml Added Paths: ----------- hippo-ecm/trunk/api/src/main/javadoc/ hippo-ecm/trunk/api/src/main/javadoc/org/ hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/ hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/ hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/api/ hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/api/doc-files/ hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/api/doc-files/encoding.html Removed Paths: ------------- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html Modified: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java =================================================================== --- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java 2010-03-15 13:26:49 UTC (rev 22134) +++ hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java 2010-03-15 14:20:45 UTC (rev 22135) @@ -86,7 +86,7 @@ * Usage of this class discouraged. If should only be used by frameworks to initialize the StringCodecFactory instance. *

    * Performs a one-way encoding (no decoding possible) for translating any UTF-8 String to a suitable set of characters that can be used in URIs. - * For the algorithm in use see {@link encoding.html} + * @see Encoding of node names */ public static class UriEncoding implements StringCodec { public String encode(String utf8) { @@ -228,7 +228,6 @@ break; default: sb.append(Character.toLowerCase(chars[i])); - //sb.append(chars[i]); } } else { switch (chars[i]) { Deleted: hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html =================================================================== --- hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html 2010-03-15 13:26:49 UTC (rev 22134) +++ hippo-ecm/trunk/api/src/main/java/org/hippoecm/repository/encoding.html 2010-03-15 14:20:45 UTC (rev 22135) @@ -1,220 +0,0 @@ - - - - - Encoding tables for URL names - - - -

    When translating a document name to a url path segment the following - rules are used:

    -
      -
    • Control characters (ASCII / UTF-8 / ISO/IEC 8859-1 codes below 0x1f and - between 0x80 and 0x9f such as tabs, carriage return, line feeds, - end-of-text, bell, etcetera) are removed;
      • -
    • A non brakable space is converted into a regular space;
      • -
    • Multiple spaces are merged into a single space;
      • -
    • Spaces are converted to hyphens;
      • -
    • All common printable characters (ASCII / UTF-8 / ISO/IEC 8859-1 - codes in the range 0x21 and 0x7f) are are used as-is, unless there - is a replacement as specified in table 1. -
    • Other special characters (ASCII / UTF-8 / ISO/IEC 8859-1 codes not - in the range 0x21 and 0x7f) that are not listed in table 2 or table 3 - are removed, including similar characters from non latin-1 tables;
      • -
    • leading spaces and ending spaces are removed.
      • -
    -

    The following translation tables for printable characters are used:

    -
    - - - - - - - - - - - - - - - - -
    table 1: special handling of some regular printable characters
    "removed
    $removed
    &removed
    'removed
    *converted into space
    +converted into hyphen removing leading and adding ending space
    ,removed
    /converted into hyphen
    :converted into hyphen removing leading and adding ending space
    ;converted into hyphen removing leading and adding ending space
    =-
    ?removed
    @-at-
    [(
    ])
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    table 2: ISO 8859-1 special characters
    ¡!
    ¢ct
    £GBP
    ¤removed
    ¥yen
    ¦|
    §removed
    ¨removed
    ©(c)
    ªremoved
    «(
    ¬not
    ­ -
    ®(r)
    ¯-
    °o
    ±-
    ²^2
    ³^3
    ´removed
    µu
    )
    ·.
    ¸removed
    ¹1
    ºo
    »)
    ¼1-4
    ½1-2
    ¾3-4
    Ðd
    ØO
    ÙU
    ÚU
    ÛU
    ÜU
    ÝY
    ÞY
    ßss
    àa
    áa
    âa
    ãa
    äa
    åa
    æae
    çc
    èe
    ée
    êe
    ëe
    ìi
    íi
    îi
    ïi
    ðd
    ñn
    òo
    óo
    ôo
    õo
    öo
    ÷-
    øo
    ùu
    úu
    ûu
    üu
    ýu
    þy
    ÿy
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    table 3: translation of UTF-8 Latin 1 characters above 0xc200
    UTF-8 c2a1!
    UTF-8 c2a2ct
    UTF-8 c2a3GBP
    UTF-8 c2a4removed
    UTF-8 c2a5yen
    UTF-8 c2a6|
    UTF-8 c2a7removed
    UTF-8 c2a8removed
    UTF-8 c2a9(c)
    UTF-8 c2aaremoved
    UTF-8 c2ab(
    UTF-8 c2acnot
    UTF-8 c2ad-
    UTF-8 c2ae(r)
    UTF-8 c2af-
    UTF-8 c2b0o
    UTF-8 c2b1plusminus
    UTF-8 c2b2^2
    UTF-8 c2b3^3
    UTF-8 c2b4removed
    UTF-8 c2b5u
    UTF-8 c2b6)
    UTF-8 c2b7.
    UTF-8 c2b8removed
    UTF-8 c2b91
    UTF-8 c2bao
    UTF-8 c2bb)
    UTF-8 c2bc1-4
    UTF-8 c2bd1-2
    UTF-8 c2be3-4
    UTF-8 c2bfremoved
    UTF-8 c380A
    UTF-8 c381A
    UTF-8 c382A
    UTF-8 c383A
    UTF-8 c384A
    UTF-8 c385A
    UTF-8 c386AE
    UTF-8 c387C
    UTF-8 c388E
    UTF-8 c389E
    UTF-8 c38aE
    UTF-8 c38bE
    UTF-8 c38cI
    UTF-8 c38dI
    UTF-8 c38eI
    UTF-8 c38fI
    UTF-8 c390D
    UTF-8 c391N
    UTF-8 c392O
    UTF-8 c393O
    UTF-8 c394O
    UTF-8 c395O
    UTF-8 c396O
    UTF-8 c397x
    UTF-8 c398O
    UTF-8 c399U
    UTF-8 c39aU
    UTF-8 c39bU
    UTF-8 c39cU
    UTF-8 c39dY
    UTF-8 c39eY
    UTF-8 c39fss
    UTF-8 c3a0a
    UTF-8 c3a1a
    UTF-8 c3a2a
    UTF-8 c3a3a
    UTF-8 c3a4a
    UTF-8 c3a5a
    UTF-8 c3a6ae
    UTF-8 c3a7c
    UTF-8 c3a8e
    UTF-8 c3a9e
    UTF-8 c3aae
    UTF-8 c3abe
    UTF-8 c3aci
    UTF-8 c3adi
    UTF-8 c3aei
    UTF-8 c3afi
    UTF-8 c3b0d
    UTF-8 c3b1n
    UTF-8 c3b2o
    UTF-8 c3b3o
    UTF-8 c3b4o
    UTF-8 c3b5o
    UTF-8 c3b6o
    UTF-8 c3b7-
    UTF-8 c3b8o
    UTF-8 c3b9u
    UTF-8 c3bau
    UTF-8 c3bbu
    UTF-8 c3bcu
    UTF-8 c3bdy
    UTF-8 c3bey
    UTF-8 c3bfy
    - - Added: hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/api/doc-files/encoding.html =================================================================== --- hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/api/doc-files/encoding.html (rev 0) +++ hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/api/doc-files/encoding.html 2010-03-15 14:20:45 UTC (rev 22135) @@ -0,0 +1,218 @@ + + + + Encoding tables for URL names + + + + +

    When translating a document name to a url path segment the following + rules are used:

    +
      +
    • Control characters (ASCII / UTF-8 / ISO/IEC 8859-1 codes below 0x1f and + between 0x80 and 0x9f such as tabs, carriage return, line feeds, + end-of-text, bell, etcetera) are removed;
      • +
    • A non brakable space is converted into a regular space;
      • +
    • Multiple spaces are merged into a single space;
      • +
    • Spaces are converted to hyphens;
      • +
    • All common printable characters (ASCII / UTF-8 / ISO/IEC 8859-1 + codes in the range 0x21 and 0x7f) are are used as-is, unless there + is a replacement as specified in table 1. +
    • Other special characters (ASCII / UTF-8 / ISO/IEC 8859-1 codes not + in the range 0x21 and 0x7f) that are not listed in table 2 or table 3 + are removed, including similar characters from non latin-1 tables;
      • +
    • leading spaces and ending spaces are removed.
      • +
    +

    The following translation tables for printable characters are used:

    +
    + + + + + + + + + + + + + + + + +
    table 1: special handling of some regular printable characters
    "removed
    $removed
    &removed
    'removed
    *converted into space
    +converted into hyphen adding leading space
    ,removed
    /converted into hyphen
    :converted into hyphen adding leading and ending space
    ;converted into hyphen adding leading and ending space
    =-
    ?removed
    @-at-
    [(
    ])
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    table 2: ISO 8859-1 special characters
    ¡!
    ¢ct
    £GBP
    ¤removed
    ¥yen
    ¦|
    §removed
    ¨removed
    ©(c)
    ªremoved
    «(
    ¬not
    ­ -
    ®(r)
    ¯-
    °o
    ±-
    ²^2
    ³^3
    ´removed
    µu
    )
    ·.
    ¸removed
    ¹1
    ºo
    »)
    ¼1-4
    ½1-2
    ¾3-4
    Ðd
    ØO
    ÙU
    ÚU
    ÛU
    ÜU
    ÝY
    ÞY
    ßss
    àa
    áa
    âa
    ãa
    äa
    åa
    æae
    çc
    èe
    ée
    êe
    ëe
    ìi
    íi
    îi
    ïi
    ðd
    ñn
    òo
    óo
    ôo
    õo
    öo
    ÷-
    øo
    ùu
    úu
    ûu
    üu
    ýu
    þy
    ÿy
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    table 3: translation of UTF-8 Latin 1 characters above 0xc200
    UTF-8 c2a1!
    UTF-8 c2a2ct
    UTF-8 c2a3GBP
    UTF-8 c2a4removed
    UTF-8 c2a5yen
    UTF-8 c2a6|
    UTF-8 c2a7removed
    UTF-8 c2a8removed
    UTF-8 c2a9(c)
    UTF-8 c2aaremoved
    UTF-8 c2ab(
    UTF-8 c2acnot
    UTF-8 c2ad-
    UTF-8 c2ae(r)
    UTF-8 c2af-
    UTF-8 c2b0o
    UTF-8 c2b1plusminus
    UTF-8 c2b2^2
    UTF-8 c2b3^3
    UTF-8 c2b4removed
    UTF-8 c2b5u
    UTF-8 c2b6)
    UTF-8 c2b7.
    UTF-8 c2b8removed
    UTF-8 c2b91
    UTF-8 c2bao
    UTF-8 c2bb)
    UTF-8 c2bc1-4
    UTF-8 c2bd1-2
    UTF-8 c2be3-4
    UTF-8 c2bfremoved
    UTF-8 c380A
    UTF-8 c381A
    UTF-8 c382A
    UTF-8 c383A
    UTF-8 c384A
    UTF-8 c385A
    UTF-8 c386AE
    UTF-8 c387C
    UTF-8 c388E
    UTF-8 c389E
    UTF-8 c38aE
    UTF-8 c38bE
    UTF-8 c38cI
    UTF-8 c38dI
    UTF-8 c38eI
    UTF-8 c38fI
    UTF-8 c390D
    UTF-8 c391N
    UTF-8 c392O
    UTF-8 c393O
    UTF-8 c394O
    UTF-8 c395O
    UTF-8 c396O
    UTF-8 c397x
    UTF-8 c398O
    UTF-8 c399U
    UTF-8 c39aU
    UTF-8 c39bU
    UTF-8 c39cU
    UTF-8 c39dY
    UTF-8 c39eY
    UTF-8 c39fss
    UTF-8 c3a0a
    UTF-8 c3a1a
    UTF-8 c3a2a
    UTF-8 c3a3a
    UTF-8 c3a4a
    UTF-8 c3a5a
    UTF-8 c3a6ae
    UTF-8 c3a7c
    UTF-8 c3a8e
    UTF-8 c3a9e
    UTF-8 c3aae
    UTF-8 c3abe
    UTF-8 c3aci
    UTF-8 c3adi
    UTF-8 c3aei
    UTF-8 c3afi
    UTF-8 c3b0d
    UTF-8 c3b1n
    UTF-8 c3b2o
    UTF-8 c3b3o
    UTF-8 c3b4o
    UTF-8 c3b5o
    UTF-8 c3b6o
    UTF-8 c3b7-
    UTF-8 c3b8o
    UTF-8 c3b9u
    UTF-8 c3bau
    UTF-8 c3bbu
    UTF-8 c3bcu
    UTF-8 c3bdy
    UTF-8 c3bey
    UTF-8 c3bfy
    + + Property changes on: hippo-ecm/trunk/api/src/main/javadoc/org/hippoecm/repository/api/doc-files/encoding.html ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/pom.xml =================================================================== --- hippo-ecm/trunk/pom.xml 2010-03-15 13:26:49 UTC (rev 22134) +++ hippo-ecm/trunk/pom.xml 2010-03-15 14:20:45 UTC (rev 22135) @@ -525,6 +525,7 @@ protected 1.5 1.6 + true http://java.sun.com/j2se/1.5.0/docs/api/ http://www.day.com/maven/jsr170/javadocs/jcr-1.0/ @@ -533,7 +534,7 @@ org.hippoecm hippo-ecm-tools-documentation - 2.09.01-SNAPSHOT + 2.12.00 @@ -852,6 +853,7 @@ false protected 1.5 + true http://java.sun.com/j2se/1.5.0/docs/api/ http://www.day.com/maven/jsr170/javadocs/jcr-1.0/ @@ -860,7 +862,7 @@ org.hippoecm hippo-ecm-tools-documentation - 2.09.01-SNAPSHOT + 2.12.00 From schans at onehippo.com Mon Mar 15 15:31:14 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 15:31:12 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_stable_=3A_Hi?= =?utf-8?q?ppo_ECM_Trunk_=C2=BB_Builtin_addon_tests_=231192?= In-Reply-To: <16161783.41268654755996.JavaMail.hudson@hudson.onehippo.org> References: <16161783.41268654755996.JavaMail.hudson@hudson.onehippo.org> Message-ID: <3738702.61268663474271.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Mon Mar 15 15:31:17 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 15 15:31:17 2010 Subject: [HippoRepos-dev] Hudson build is back to stable : Hippo ECM Trunk #1192 In-Reply-To: <12507666.51268654758488.JavaMail.hudson@hudson.onehippo.org> References: <12507666.51268654758488.JavaMail.hudson@hudson.onehippo.org> Message-ID: <8061067.71268663477281.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Mon Mar 15 15:51:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Mon Mar 15 15:56:28 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3972) Replication - numberOfRetries not exactly fulfilled In-Reply-To: <8920783.3559.1268402208776.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <31638240.4859.1268664708698.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86873#action_86873 ] Bart van der Schans commented on HREPTWO-3972: ---------------------------------------------- This is mostly a logging issue. The number times the replication operation is retried is correct. > Replication - numberOfRetries not exactly fulfilled > --------------------------------------------------- > > Key: HREPTWO-3972 > URL: http://issues.onehippo.com/browse/HREPTWO-3972 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: n/a > Reporter: Sylvain P?lissier > Assignee: Bart van der Schans > Priority: Low > Fix For: r2.13.00 > > Attachments: numberOfRetries .log > > > The Master tries to obtain a session to the RMI host:port that is defined int he web.xml file of the Slave. If for some reason, such as a typo in the above definition, then it is supposed to try again after retryDelay milliseconds as many times as the value of numberOfRetries. > I have forced that the Master could not locate the host of the Slave (Master and Slave are running on two different hosts but in web.xml of the Master, is set to localhost. > I have attached the console output, because although numberOfRetries is set to 5 (default value), it does actually try 1 to 6 times (problem 1), and continues after the sixth retry has failed. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 15 15:52:12 2010 From: svn-logs at hippocms.org (bvdschans) Date: Mon Mar 15 15:56:54 2010 Subject: [HippoRepos-dev] [22136] hippo-ecm: HREPTWO-3972: Improve logging on the number of retries performed Message-ID: <20100315145212.BCC6C1C020@svn.vm.castaserver.com> Revision: 22136 Author: bvdschans Date: 2010-03-15 15:52:12 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-3972: Improve logging on the number of retries performed Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java 2010-03-15 14:20:45 UTC (rev 22135) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java 2010-03-15 14:52:12 UTC (rev 22136) @@ -392,11 +392,13 @@ return; } catch (RetryReplicationException e) { tries++; - log.info("Recoverable exception (" + e.getMessage() + ") encountered with revision: " + record.getRevision() - + ". Trying again in " + getRetryDelay() + " ms. Try " + tries + " of " - + getMaxRetries()); error = e; - waitWithoutLock(getRetryDelay()); + if (tries <= getMaxRetries()) { + log.info("Recoverable exception (" + e.getMessage() + ") encountered with revision: " + + record.getRevision() + ". Trying again [" + tries + "/" + getMaxRetries() + "] in " + + getRetryDelay() + " ms."); + waitWithoutLock(getRetryDelay()); + } } } String msg = getIdString() + ": Unable to replicate revision '" + record.getRevision() + "'."; From helpdesk at onehippo.com Mon Mar 15 16:13:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 15 16:18:28 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3975) New Events Cannot Be Saved - java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String Message-ID: <8522062.4902.1268666028534.JavaMail.jira@jira.vm.castaserver.com> New Events Cannot Be Saved - java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String ------------------------------------------------------------------------------------------------------------ Key: HREPTWO-3975 URL: http://issues.onehippo.com/browse/HREPTWO-3975 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07 Environment: Hippo Repository 2.12.07-SNAPSHOT build 22077 Reporter: Sylvain P?lissier Attachments: stack STEPS: ------ Under the Quickstart, Add a Root Folder Add a Document of Type Event (Gebeurtenis) to it. Click Save or Done (Sla op or Klaar) and be greated with the following exception: java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String The error stack is available as attachment (stack) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 15 16:17:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 15 16:22:30 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-1977) Search should be limited by 10 In-Reply-To: <24921599.1228901938691.JavaMail.jira@hat01> Message-ID: <25848778.4914.1268666268670.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86883#action_86883 ] Sylvain P?lissier commented on HREPTWO-1977: -------------------------------------------- I see this change from With Pipeline (december last year) to Resolved. And it has to do with version 2.2.00. It does not say if it must also be fixed elsewhere. Is it OK to close? Or do you need anything else? > Search should be limited by 10 > ------------------------------ > > Key: HREPTWO-1977 > URL: http://issues.onehippo.com/browse/HREPTWO-1977 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.01.xx (m08) > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Fix For: r2.02.00 (m09) > > Original Estimate: 0 minutes > Remaining Estimate: 0 minutes > > This will break the search results indication, but as long as we don't have a way to display more results, this doesn't matter. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 15 16:22:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 15 16:27:28 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-1977) Search should be limited by 10 In-Reply-To: <24921599.1228901938691.JavaMail.jira@hat01> Message-ID: <7120177.4924.1268666568585.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86885#action_86885 ] Sylvain P?lissier commented on HREPTWO-1977: -------------------------------------------- Sorry Hendrik. Miscom. > Search should be limited by 10 > ------------------------------ > > Key: HREPTWO-1977 > URL: http://issues.onehippo.com/browse/HREPTWO-1977 > Project: Hippo Repository 2 > Issue Type: Improvement > Affects Versions: r2.01.xx (m08) > Reporter: Arthur Bogaart > Assignee: Hendrik Hijzen > Fix For: r2.02.00 (m09) > > Original Estimate: 0 minutes > Remaining Estimate: 0 minutes > > This will break the search results indication, but as long as we don't have a way to display more results, this doesn't matter. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 15 16:24:31 2010 From: svn-logs at hippocms.org (bvdschans) Date: Mon Mar 15 16:29:13 2010 Subject: [HippoRepos-dev] [22139] hippo-ecm: HREPTWO-3972: Improve logging on the number of retries performed Message-ID: <20100315152431.43D971C020@svn.vm.castaserver.com> Revision: 22139 Author: bvdschans Date: 2010-03-15 16:24:30 +0100 (Mon, 15 Mar 2010) Log Message: ----------- HREPTWO-3972: Improve logging on the number of retries performed Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java 2010-03-15 15:23:19 UTC (rev 22138) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/ReplicatorNode.java 2010-03-15 15:24:30 UTC (rev 22139) @@ -392,11 +392,13 @@ return; } catch (RetryReplicationException e) { tries++; - log.info("Recoverable exception (" + e.getMessage() + ") encountered with revision: " + record.getRevision() - + ". Trying again in " + getRetryDelay() + " ms. Try " + tries + " of " - + getMaxRetries()); error = e; - waitWithoutLock(getRetryDelay()); + if (tries <= getMaxRetries()) { + log.info("Recoverable exception (" + e.getMessage() + ") encountered with revision: " + + record.getRevision() + ". Trying again [" + tries + "/" + getMaxRetries() + "] in " + + getRetryDelay() + " ms."); + waitWithoutLock(getRetryDelay()); + } } } String msg = getIdString() + ": Unable to replicate revision '" + record.getRevision() + "'."; From helpdesk at onehippo.com Mon Mar 15 16:24:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Mon Mar 15 16:29:28 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3972) Replication - numberOfRetries not exactly fulfilled In-Reply-To: <8920783.3559.1268402208776.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <16028377.4932.1268666688671.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3972?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3972: ----------------------------------------- Fix Version/s: r2.12.08 > Replication - numberOfRetries not exactly fulfilled > --------------------------------------------------- > > Key: HREPTWO-3972 > URL: http://issues.onehippo.com/browse/HREPTWO-3972 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: n/a > Reporter: Sylvain P?lissier > Assignee: Bart van der Schans > Priority: Low > Fix For: r2.12.08, r2.13.00 > > Attachments: numberOfRetries .log > > > The Master tries to obtain a session to the RMI host:port that is defined int he web.xml file of the Slave. If for some reason, such as a typo in the above definition, then it is supposed to try again after retryDelay milliseconds as many times as the value of numberOfRetries. > I have forced that the Master could not locate the host of the Slave (Master and Slave are running on two different hosts but in web.xml of the Master, is set to localhost. > I have attached the console output, because although numberOfRetries is set to 5 (default value), it does actually try 1 to 6 times (problem 1), and continues after the sixth retry has failed. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 09:51:49 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 16 09:56:32 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3974) dash/hyphen is not supported by the search In-Reply-To: <30130290.4611.1268659188937.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29749295.5172.1268729509610.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3974?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86930#action_86930 ] Sylvain P?lissier commented on HREPTWO-3974: -------------------------------------------- this-is-it, the searched term, is made of stop words. When I use another term, say ta-da, it is not found in the CMS, but it is found from the /repository servlet using //*[jcr:contains(.,'ta-da')]. > dash/hyphen is not supported by the search > ------------------------------------------ > > Key: HREPTWO-3974 > URL: http://issues.onehippo.com/browse/HREPTWO-3974 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Reporter: Sylvain P?lissier > > You can't search for documents when the search term embeds a dash or hyphen. > For example, search for documents containing this-is-it with the help of this-it returns nothing. > However, search for documents containing 3*5+8-7=16 with the help of 8-7 returns the document. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 10:25:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Tue Mar 16 10:30:34 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3975) New Events Cannot Be Saved - java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String In-Reply-To: <8522062.4902.1268666028534.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <23524478.5210.1268731548703.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3975?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3975: ---------------------------------------- Fix Version/s: r2.12.08 r2.13.00 > New Events Cannot Be Saved - java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String > ------------------------------------------------------------------------------------------------------------ > > Key: HREPTWO-3975 > URL: http://issues.onehippo.com/browse/HREPTWO-3975 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Hippo Repository 2.12.07-SNAPSHOT build 22077 > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.12.08, r2.13.00 > > Attachments: stack > > > STEPS: > ------ > Under the Quickstart, Add a Root Folder > Add a Document of Type Event (Gebeurtenis) to it. > Click Save or Done (Sla op or Klaar) and be greated with the following exception: > java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String > The error stack is available as attachment (stack) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 10:25:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 16 10:30:39 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3974) dash/hyphen is not supported by the search In-Reply-To: <30130290.4611.1268659188937.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10795437.5217.1268731548845.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3974?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3974: ---------------------------------------- Fix Version/s: r2.13.00 > dash/hyphen is not supported by the search > ------------------------------------------ > > Key: HREPTWO-3974 > URL: http://issues.onehippo.com/browse/HREPTWO-3974 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Reporter: Sylvain P?lissier > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > You can't search for documents when the search term embeds a dash or hyphen. > For example, search for documents containing this-is-it with the help of this-it returns nothing. > However, search for documents containing 3*5+8-7=16 with the help of 8-7 returns the document. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 10:29:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 16 10:34:32 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3969) Username / password show up as GET request parameters In-Reply-To: <14405983.2870.1268314248613.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21209200.5236.1268731788769.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3969?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3969: ---------------------------------------- Fix Version/s: ongoing > Username / password show up as GET request parameters > ----------------------------------------------------- > > Key: HREPTWO-3969 > URL: http://issues.onehippo.com/browse/HREPTWO-3969 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.12.06 > Environment: Ubuntu 9.10 , Firefox 3.5, NO Virtual machine > Reporter: Dennis Dam > Assignee: Sylvain P?lissier > Fix For: ongoing > > > I started my laptop this morning, opened Firefox (3.5) and still had a Tab open with the CMS login page in it. Then I noticed that the username and password were in the url as request parameters: > http://localhost:8085/cms?username=test-ocw&password=test > I did not type this url manually or anything like that. I don't have a clear reproduction path for this issue. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 10:29:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Tue Mar 16 10:34:36 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3806) Create component/behavior library In-Reply-To: <25554048.30161265980706728.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <6627636.5238.1268731788805.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3806?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3806: ---------------------------------------- Fix Version/s: r2.13.00 > Create component/behavior library > --------------------------------- > > Key: HREPTWO-3806 > URL: http://issues.onehippo.com/browse/HREPTWO-3806 > Project: Hippo Repository 2 > Issue Type: Improvement > Reporter: Frank van Lankvelt > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > > Create a component and/or behavior library that is independent of the plugin framework. Many behaviors are now embedded in a plugin, attaching to other plugins. Simply adding these behaviors to the other plugins in java code makes the plugins a lot easier to understand and reduces the amount of configuration. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 12:13:48 2010 From: helpdesk at onehippo.com (JIRA (Vijay Kiran)) Date: Tue Mar 16 12:18:31 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3976) JCRValueList caching problem Message-ID: <8082109.5839.1268738028521.JavaMail.jira@jira.vm.castaserver.com> JCRValueList caching problem ---------------------------- Key: HREPTWO-3976 URL: http://issues.onehippo.com/browse/HREPTWO-3976 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.09.07 Reporter: Vijay Kiran JCRValueList seems to be caching the values. This is creating problem with taxonomy plugin, which can't get the current values of the property. See HIPPLUG-58 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 12:13:48 2010 From: helpdesk at onehippo.com (JIRA (Vijay Kiran)) Date: Tue Mar 16 12:18:34 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3977) UnitTest for JCRValueList Message-ID: <16788608.5841.1268738028543.JavaMail.jira@jira.vm.castaserver.com> UnitTest for JCRValueList ------------------------- Key: HREPTWO-3977 URL: http://issues.onehippo.com/browse/HREPTWO-3977 Project: Hippo Repository 2 Issue Type: Task Reporter: Vijay Kiran There's no corresponding unit test for org.hippoecm.frontend.model.map.JcrValueList -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 12:33:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 16 12:38:33 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <33517005.5873.1268739228837.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=86984#action_86984 ] Sylvain P?lissier commented on HREPTWO-3651: -------------------------------------------- I tested this with the below results (some pictures are attached). STEPS ----- 1. configure 'htmlmode' 2. create a News 3. in body, activate 'view source' 4. paste the following text (between >>> and <<<) >>> <<< 5. deactivatye 'view source' => make screenshot-1 6. activate 'view source' again => make screenshot-2 Tested browsers: ---------------- - Opera 10.5 - IE 8 - Firefox 3.6 - Chrome 4.1 Notes: ------ 1. cmssnap is the .WAR file I deployed (quickstart) > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Sylvain P?lissier > Priority: Top > Fix For: r2.12.07, r2.13.00 > > Attachments: chrome.png, firefox.png, ie8.png > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 12:33:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 16 12:38:36 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26253421.5881.1268739228953.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3651: --------------------------------------- Attachment: chrome.png firefox.png ie8.png > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Sylvain P?lissier > Priority: Top > Fix For: r2.12.07, r2.13.00 > > Attachments: chrome.png, firefox.png, ie8.png > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 12:35:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 16 12:40:33 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2946647.5886.1268739348646.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3651: --------------------------------------- Attachment: opera.png > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Sylvain P?lissier > Priority: Top > Fix For: r2.12.07, r2.13.00 > > Attachments: firefox.png, ie8.png, opera.png > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 12:35:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 16 12:40:36 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21109748.5889.1268739348708.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3651: --------------------------------------- Attachment: (was: chrome.png) > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Sylvain P?lissier > Priority: Top > Fix For: r2.12.07, r2.13.00 > > Attachments: firefox.png, ie8.png, opera.png > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 12:37:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 16 12:42:32 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <15772109.5892.1268739468538.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3651: --------------------------------------- Attachment: chrome.png > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Sylvain P?lissier > Priority: Top > Fix For: r2.12.07, r2.13.00 > > Attachments: chrome.png, firefox.png, ie8.png, opera.png > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 13:25:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Tue Mar 16 13:30:35 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3651) Cross-site scripting possible using IMG-tags in Xinha field In-Reply-To: <33001807.177331263559860273.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29403651.5936.1268742348531.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3651?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier updated HREPTWO-3651: --------------------------------------- Attachment: stack The Java stack trace that shows on the Tomcat console > Cross-site scripting possible using IMG-tags in Xinha field > ----------------------------------------------------------- > > Key: HREPTWO-3651 > URL: http://issues.onehippo.com/browse/HREPTWO-3651 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.09.05 > Reporter: Dennis Dam > Assignee: Frank van Lankvelt > Priority: Top > Fix For: r2.12.07, r2.13.00 > > Attachments: chrome.png, firefox.png, ie8.png, opera.png, stack > > > Within a XInha field, the HTML can be edited directly. The XSS examples below are not correctly filtered > Reproduction: > - Create a new document. > - Select html mode for a Xinha field > - Enter one of the examples below > - Press finished. > Expected: > The editor filters the script elements from the HTML > Result: > The editor leaves the scripts in the HTML. There is a possibility of cross-site scripting. > ------------------ > Examples: > ------------------ > Werkt voor nagenoeg alle browsers (IE7, FF3.5, Opera 10.10): > > Werkt onder Opera 10.10: > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 14:41:48 2010 From: helpdesk at onehippo.com (JIRA (Jettro Coenradie)) Date: Tue Mar 16 14:46:31 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3978) Deadlock in version storage - VersionManagerImpl Message-ID: <28596032.5996.1268746908566.JavaMail.jira@jira.vm.castaserver.com> Deadlock in version storage - VersionManagerImpl ------------------------------------------------ Key: HREPTWO-3978 URL: http://issues.onehippo.com/browse/HREPTWO-3978 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Reporter: Jettro Coenradie Priority: High During concurrent cms usage we encountered a deadlock situation. The following output was obtained using a kill -3 on the tomcat server "TP-Processor5" daemon prio=10 tid=0x00007ff076f43000 nid=0x48a3 waiting for monitor entry [0x000000004354a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:565) - waiting to lock <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) - locked <0x00007ff09b34eb80> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:232) at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:161) at sun.reflect.GeneratedMethodAccessor89.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) - locked <0x00007ff09b44a230> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at $Proxy6.add(Unknown Source) at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:263) at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:237) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.onOk(CompatibilityWorkflowPlugin.java:200) at org.hippoecm.frontend.dialog.AbstractDialog.handleSubmit(AbstractDialog.java:526) at org.hippoecm.frontend.dialog.AbstractDialog$2.onSubmit(AbstractDialog.java:395) at org.hippoecm.frontend.dialog.AbstractDialog$ButtonWrapper$1.onSubmit(AbstractDialog.java:265) at org.apache.wicket.ajax.markup.html.form.AjaxButton$1.onSubmit(AjaxButton.java:102) at org.apache.wicket.ajax.form.AjaxFormSubmitBehavior.onEvent(AjaxFormSubmitBehavior.java:143) at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-50" daemon prio=10 tid=0x00007ff068245000 nid=0x4635 in Object.wait() [0x0000000047188000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837d94a8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-49" daemon prio=10 tid=0x00007ff068c37000 nid=0x4634 in Object.wait() [0x0000000047087000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837d67b0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-48" daemon prio=10 tid=0x00007ff068c35000 nid=0x4633 in Object.wait() [0x0000000046f86000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837d9850> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-47" daemon prio=10 tid=0x00007ff068ceb800 nid=0x4632 in Object.wait() [0x0000000046e85000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837d6af8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-46" daemon prio=10 tid=0x00007ff068cea000 nid=0x4631 in Object.wait() [0x0000000046d84000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837d6eb0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-45" daemon prio=10 tid=0x00007ff068dcc000 nid=0x4630 in Object.wait() [0x0000000046c83000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837d9c08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-44" daemon prio=10 tid=0x00007ff0683ee000 nid=0x462f in Object.wait() [0x0000000046b82000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837d9e28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-43" daemon prio=10 tid=0x00007ff0683ec000 nid=0x462e in Object.wait() [0x0000000046a81000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e0108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-42" daemon prio=10 tid=0x00007ff068c04800 nid=0x462d in Object.wait() [0x0000000046980000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e04c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-41" daemon prio=10 tid=0x00007ff068ab5800 nid=0x462c in Object.wait() [0x000000004687f000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e27f0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-40" daemon prio=10 tid=0x00007ff068ab3800 nid=0x462b in Object.wait() [0x000000004677e000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e0878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-39" daemon prio=10 tid=0x00007ff068dc9000 nid=0x462a in Object.wait() [0x000000004667d000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e2b38> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-38" daemon prio=10 tid=0x00007ff0699b2800 nid=0x4629 in Object.wait() [0x000000004657c000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e2d58> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-37" daemon prio=10 tid=0x00007ff068c38800 nid=0x4628 in Object.wait() [0x000000004647b000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e0bc0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-36" daemon prio=10 tid=0x00007ff069a98800 nid=0x4627 in Object.wait() [0x000000004637a000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e30a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-35" daemon prio=10 tid=0x00007ff0680a7000 nid=0x4626 in Object.wait() [0x0000000046279000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-34" daemon prio=10 tid=0x00007ff068ce8800 nid=0x4625 in Object.wait() [0x0000000046178000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e3458> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-33" daemon prio=10 tid=0x00007ff06951e800 nid=0x4624 in Object.wait() [0x0000000046077000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e1250> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-32" daemon prio=10 tid=0x00007ff06d6f6000 nid=0x4623 in Object.wait() [0x0000000045f76000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e37d8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-31" daemon prio=10 tid=0x00007ff06d6f4000 nid=0x4622 in Object.wait() [0x0000000045e75000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e1608> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-30" daemon prio=10 tid=0x00007ff06c1a9000 nid=0x4621 in Object.wait() [0x0000000045d74000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e3b20> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-29" daemon prio=10 tid=0x00007ff06c1a7000 nid=0x4620 in Object.wait() [0x0000000045c73000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374def8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-28" daemon prio=10 tid=0x00007ff06c1a5000 nid=0x461f in Object.wait() [0x0000000045b72000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374e240> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-27" daemon prio=10 tid=0x00007ff06c1a3000 nid=0x461e in Object.wait() [0x0000000045a71000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374e588> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-26" daemon prio=10 tid=0x00007ff06c1a2800 nid=0x461d in Object.wait() [0x0000000045970000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374e940> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-25" daemon prio=10 tid=0x00007ff06c0c0800 nid=0x461c in Object.wait() [0x000000004586f000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374eb60> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-24" daemon prio=10 tid=0x00007ff06c0c0000 nid=0x461b in Object.wait() [0x000000004576e000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374ee70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-23" daemon prio=10 tid=0x00007ff06d846000 nid=0x461a in Object.wait() [0x000000004566d000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374f1b8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-22" daemon prio=10 tid=0x00007ff06c3f5800 nid=0x4619 in Object.wait() [0x000000004556c000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff08374f500> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-21" daemon prio=10 tid=0x00007ff06c3f3800 nid=0x4618 in Object.wait() [0x000000004546b000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e52d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-20" daemon prio=10 tid=0x00007ff06d844800 nid=0x4617 in Object.wait() [0x000000004536a000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e5618> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-19" daemon prio=10 tid=0x00007ff06d842800 nid=0x4616 in Object.wait() [0x0000000045269000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e5960> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-18" daemon prio=10 tid=0x00007ff06d840800 nid=0x4615 in Object.wait() [0x0000000045168000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e5d50> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-17" daemon prio=10 tid=0x00007ff06c196800 nid=0x4614 in Object.wait() [0x0000000045067000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e6108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-16" daemon prio=10 tid=0x00007ff06c194800 nid=0x4613 in Object.wait() [0x0000000044f66000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e1950> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-15" daemon prio=10 tid=0x00007ff06c193000 nid=0x4612 in Object.wait() [0x0000000044e65000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e64c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-14" daemon prio=10 tid=0x00007ff06c191000 nid=0x4611 in Object.wait() [0x0000000044d64000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e6878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-13" daemon prio=10 tid=0x00007ff06db01800 nid=0x4610 in Object.wait() [0x0000000044c63000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e81e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-12" daemon prio=10 tid=0x00007ff06daff800 nid=0x460f in Object.wait() [0x0000000044b62000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e85a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-11" daemon prio=10 tid=0x00007ff06dafd800 nid=0x460e in Object.wait() [0x0000000044a61000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e88e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-10" daemon prio=10 tid=0x00007ff06dafc000 nid=0x460d in Object.wait() [0x0000000044960000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e8b08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-9" daemon prio=10 tid=0x00007ff06c097000 nid=0x460c in Object.wait() [0x000000004485f000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e8ef8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-8" daemon prio=10 tid=0x00007ff06c095000 nid=0x460b in Object.wait() [0x000000004475e000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e6c98> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-7" daemon prio=10 tid=0x00007ff06c093000 nid=0x460a in Object.wait() [0x000000004465d000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e9558> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-6" daemon prio=10 tid=0x00007ff06c091000 nid=0x4609 in Object.wait() [0x000000004455c000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e6d70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-5" daemon prio=10 tid=0x00007ff06c010800 nid=0x4608 in Object.wait() [0x000000004445b000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e98a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-4" daemon prio=10 tid=0x00007ff06c00e800 nid=0x4607 in Object.wait() [0x000000004435a000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837eae28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-3" daemon prio=10 tid=0x00007ff06c015000 nid=0x4606 in Object.wait() [0x0000000044259000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837eb218> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-2" daemon prio=10 tid=0x00007ff06d7bd000 nid=0x4605 in Object.wait() [0x0000000044158000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837eb5d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-1" daemon prio=10 tid=0x00007ff06d7bc000 nid=0x4604 in Object.wait() [0x0000000044057000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007ff0837e3e68> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.20-8444-Acceptor-0" daemon prio=10 tid=0x00007ff06d7b9800 nid=0x4603 runnable [0x0000000043f56000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007ff07e2b3660> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) at java.lang.Thread.run(Thread.java:619) "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007ff06d7af800 nid=0x4602 waiting on condition [0x0000000043e55000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) at java.lang.Thread.run(Thread.java:619) "TP-Monitor" daemon prio=10 tid=0x00007ff06e29c000 nid=0x4601 in Object.wait() [0x0000000043d54000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(Native Method) at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) - locked <0x00007ff08372be60> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) at java.lang.Thread.run(Thread.java:619) "TP-Processor4" daemon prio=10 tid=0x00007ff06c293000 nid=0x4600 runnable [0x0000000043c53000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007ff0836e14c8> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:307) at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:661) at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor3" daemon prio=10 tid=0x00007ff06c0e4000 nid=0x45ff in Object.wait() [0x0000000043b50000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) at org.hippoecm.repository.standardworkflow.EventLoggerImpl.applyAppender(EventLoggerImpl.java:190) at org.hippoecm.repository.standardworkflow.EventLoggerImpl.logEvent(EventLoggerImpl.java:141) at sun.reflect.GeneratedMethodAccessor73.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at $Proxy1.logEvent(Unknown Source) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:135) at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:143) at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) at org.apache.wicket.markup.html.form.Form.process(Form.java:914) at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor2" daemon prio=10 tid=0x00007ff06c0e8800 nid=0x45fe in Object.wait() [0x0000000043a4f000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) at org.apache.jackrabbit.core.version.AbstractVersionManager$WriteOperation.save(AbstractVersionManager.java:150) at org.apache.jackrabbit.core.version.AbstractVersionManager.createVersionHistory(AbstractVersionManager.java:317) at org.apache.jackrabbit.core.version.VersionManagerImpl$1.run(VersionManagerImpl.java:220) at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:567) - locked <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:499) - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at $Proxy3.obtainEditableInstance(Unknown Source) at org.hippoecm.frontend.plugins.reviewedactions.FullReviewedActionsWorkflowPlugin$3.execute(FullReviewedActionsWorkflowPlugin.java:137) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) at org.hippoecm.addon.workflow.MenuAction$1.onClick(MenuAction.java:43) at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor1" daemon prio=10 tid=0x00007ff06daa9000 nid=0x45fd in Object.wait() [0x0000000042237000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) - locked <0x00007ff0bdd8c778> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) at org.hippoecm.repository.decorating.checked.ItemDecorator.save(ItemDecorator.java:173) at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:176) at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) at org.apache.wicket.markup.html.form.Form.process(Form.java:914) at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "http-8080-Acceptor-0" daemon prio=10 tid=0x00007ff06c0ee000 nid=0x45fc runnable [0x000000004253c000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007ff07e28cd70> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) at java.lang.Thread.run(Thread.java:619) "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x00007ff06c0eb000 nid=0x45fb waiting on condition [0x0000000042e45000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) at java.lang.Thread.run(Thread.java:619) "RMI TCP Accept-1099" daemon prio=10 tid=0x00007ff077047800 nid=0x45f7 runnable [0x000000004233a000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007ff083319458> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) at java.lang.Thread.run(Thread.java:619) "GC Daemon" daemon prio=10 tid=0x00007ff077a11800 nid=0x45f3 in Object.wait() [0x000000004273e000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(Native Method) at sun.misc.GC$Daemon.run(GC.java:100) - locked <0x00007ff0837e6f90> (a sun.misc.GC$LatencyLock) "RMI Reaper" prio=10 tid=0x00007ff075853800 nid=0x45f2 in Object.wait() [0x0000000041c4f000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) - locked <0x00007ff0837e71a8> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) at java.lang.Thread.run(Thread.java:619) "RMI TCP Accept-0" daemon prio=10 tid=0x00007ff077334800 nid=0x45f1 runnable [0x000000004187e000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007ff08331a5e0> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) at java.lang.Thread.run(Thread.java:619) "HJCRQJS_QuartzSchedulerThread" prio=10 tid=0x00007ff068ce7000 nid=0x45f0 sleeping[0x0000000041b4e000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at org.quartz.core.QuartzSchedulerThread.run(QuartzSchedulerThread.java:394) "HJCRQJS_Worker-0" prio=10 tid=0x00007ff068394000 nid=0x45ef in Object.wait() [0x0000000043950000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(Native Method) at org.quartz.simpl.SimpleThreadPool.getNextRunnable(SimpleThreadPool.java:428) - locked <0x00007ff082e75448> (a java.lang.Object) at org.quartz.simpl.SimpleThreadPool.access$000(SimpleThreadPool.java:47) at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:518) "RefreshingEventListener" prio=10 tid=0x00007ff068a96000 nid=0x45ee waiting on condition [0x000000004384f000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at org.hippoecm.repository.RefreshingEventListener$1.run(RefreshingEventListener.java:96) "ClusterNode-s1720" daemon prio=10 tid=0x00007ff070794800 nid=0x334c in Object.wait() [0x000000004374e000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) - locked <0x00007ff07e8bbc78> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) at java.lang.Thread.run(Thread.java:619) "IndexMerger" daemon prio=10 tid=0x00007ff06c05f800 nid=0x7271 in Object.wait() [0x000000004263d000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) - locked <0x00007ff0813e2858> (a org.apache.commons.collections.buffer.BlockingBuffer) at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) "Timer-0" daemon prio=10 tid=0x00007ff06c001000 nid=0x7266 in Object.wait() [0x0000000041594000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.util.TimerThread.mainLoop(Timer.java:509) - locked <0x00007ff080de49d0> (a java.util.TaskQueue) at java.util.TimerThread.run(Timer.java:462) "IndexMerger" daemon prio=10 tid=0x00007ff07794c800 nid=0x7265 in Object.wait() [0x00000000412be000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) - locked <0x00007ff07f40c0d8> (a org.apache.commons.collections.buffer.BlockingBuffer) at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) "ObservationManager" daemon prio=10 tid=0x00007ff077076800 nid=0x724d in Object.wait() [0x000000004067f000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) - locked <0x00007ff07eadd8f8> (a org.apache.commons.collections.buffer.BlockingBuffer) at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) at java.lang.Thread.run(Thread.java:619) "Transient File Reaper" daemon prio=10 tid=0x00007ff07041e800 nid=0x724c in Object.wait() [0x0000000040a39000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) - waiting on <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) - locked <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007ff070483000 nid=0x724b in Object.wait() [0x00000000411bd000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) - waiting on <0x00007ff07e6accc0> (a java.util.TaskQueue) at java.lang.Object.wait(Object.java:485) at java.util.TimerThread.mainLoop(Timer.java:483) - locked <0x00007ff07e6accc0> (a java.util.TaskQueue) at java.util.TimerThread.run(Timer.java:462) "Low Memory Detector" daemon prio=10 tid=0x00007ff070004000 nid=0x7240 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE "CompilerThread1" daemon prio=10 tid=0x00007ff070001000 nid=0x723f waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE "CompilerThread0" daemon prio=10 tid=0x00007ff077aa7800 nid=0x723e waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE "Signal Dispatcher" daemon prio=10 tid=0x00007ff077aa5800 nid=0x723d waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE "Finalizer" daemon prio=10 tid=0x00007ff077f29800 nid=0x723a in Object.wait() [0x0000000042138000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) - locked <0x00007ff07e214fe8> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159) "Reference Handler" daemon prio=10 tid=0x00007ff077f22000 nid=0x7239 in Object.wait() [0x0000000040fbb000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) - locked <0x00007ff07e214fb0> (a java.lang.ref.Reference$Lock) "main" prio=10 tid=0x0000000040113800 nid=0x722e runnable [0x0000000040836000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007ff0836f5d60> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at org.apache.catalina.core.StandardServer.await(StandardServer.java:389) at org.apache.catalina.startup.Catalina.await(Catalina.java:647) at org.apache.catalina.startup.Catalina.start(Catalina.java:607) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) "VM Thread" prio=10 tid=0x00007ff077f1b000 nid=0x7237 runnable "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x722f runnable "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x7230 runnable "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121800 nid=0x7231 runnable "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x7232 runnable "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x7233 runnable "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040127000 nid=0x7234 runnable "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x7235 runnable "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x7236 runnable "VM Periodic Task Thread" prio=10 tid=0x00007ff070007000 nid=0x7241 waiting on condition JNI global references: 1147 Heap PSYoungGen total 670528K, used 301659K [0x00007ff128b90000, 0x00007ff161a80000, 0x00007ff17e0e0000) eden space 592512K, 37% used [0x00007ff128b90000,0x00007ff136605ee8,0x00007ff14ce30000) from space 78016K, 99% used [0x00007ff158160000,0x00007ff15cd81020,0x00007ff15cd90000) to space 78784K, 0% used [0x00007ff15cd90000,0x00007ff15cd90000,0x00007ff161a80000) PSOldGen total 1465344K, used 1096343K [0x00007ff07e0e0000, 0x00007ff0d77e0000, 0x00007ff128b90000) object space 1465344K, 74% used [0x00007ff07e0e0000,0x00007ff0c0f85ea0,0x00007ff0d77e0000) PSPermGen total 54976K, used 54410K [0x00007ff078ce0000, 0x00007ff07c290000, 0x00007ff07e0e0000) object space 54976K, 98% used [0x00007ff078ce0000,0x00007ff07c2028f0,0x00007ff07c290000) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 14:49:48 2010 From: helpdesk at onehippo.com (JIRA (Jettro Coenradie)) Date: Tue Mar 16 14:54:33 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3978) Deadlock in version storage - VersionManagerImpl In-Reply-To: <28596032.5996.1268746908566.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17285597.6018.1268747388640.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3978?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87018#action_87018 ] Jettro Coenradie commented on HREPTWO-3978: ------------------------------------------- The fine grained item state locking is used/configured > Deadlock in version storage - VersionManagerImpl > ------------------------------------------------ > > Key: HREPTWO-3978 > URL: http://issues.onehippo.com/browse/HREPTWO-3978 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jettro Coenradie > Priority: High > > During concurrent cms usage we encountered a deadlock situation. The following output was obtained using a kill -3 on the tomcat server > "TP-Processor5" daemon prio=10 tid=0x00007ff076f43000 nid=0x48a3 waiting for monitor entry [0x000000004354a000] > java.lang.Thread.State: BLOCKED (on object monitor) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:565) > - waiting to lock <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff09b34eb80> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:232) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:161) > at sun.reflect.GeneratedMethodAccessor89.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff09b44a230> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy6.add(Unknown Source) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:263) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:237) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.onOk(CompatibilityWorkflowPlugin.java:200) > at org.hippoecm.frontend.dialog.AbstractDialog.handleSubmit(AbstractDialog.java:526) > at org.hippoecm.frontend.dialog.AbstractDialog$2.onSubmit(AbstractDialog.java:395) > at org.hippoecm.frontend.dialog.AbstractDialog$ButtonWrapper$1.onSubmit(AbstractDialog.java:265) > at org.apache.wicket.ajax.markup.html.form.AjaxButton$1.onSubmit(AjaxButton.java:102) > at org.apache.wicket.ajax.form.AjaxFormSubmitBehavior.onEvent(AjaxFormSubmitBehavior.java:143) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-50" daemon prio=10 tid=0x00007ff068245000 nid=0x4635 in Object.wait() [0x0000000047188000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d94a8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-49" daemon prio=10 tid=0x00007ff068c37000 nid=0x4634 in Object.wait() [0x0000000047087000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d67b0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-48" daemon prio=10 tid=0x00007ff068c35000 nid=0x4633 in Object.wait() [0x0000000046f86000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9850> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-47" daemon prio=10 tid=0x00007ff068ceb800 nid=0x4632 in Object.wait() [0x0000000046e85000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6af8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-46" daemon prio=10 tid=0x00007ff068cea000 nid=0x4631 in Object.wait() [0x0000000046d84000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6eb0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-45" daemon prio=10 tid=0x00007ff068dcc000 nid=0x4630 in Object.wait() [0x0000000046c83000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9c08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-44" daemon prio=10 tid=0x00007ff0683ee000 nid=0x462f in Object.wait() [0x0000000046b82000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9e28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-43" daemon prio=10 tid=0x00007ff0683ec000 nid=0x462e in Object.wait() [0x0000000046a81000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-42" daemon prio=10 tid=0x00007ff068c04800 nid=0x462d in Object.wait() [0x0000000046980000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e04c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-41" daemon prio=10 tid=0x00007ff068ab5800 nid=0x462c in Object.wait() [0x000000004687f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e27f0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-40" daemon prio=10 tid=0x00007ff068ab3800 nid=0x462b in Object.wait() [0x000000004677e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-39" daemon prio=10 tid=0x00007ff068dc9000 nid=0x462a in Object.wait() [0x000000004667d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2b38> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-38" daemon prio=10 tid=0x00007ff0699b2800 nid=0x4629 in Object.wait() [0x000000004657c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2d58> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-37" daemon prio=10 tid=0x00007ff068c38800 nid=0x4628 in Object.wait() [0x000000004647b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0bc0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-36" daemon prio=10 tid=0x00007ff069a98800 nid=0x4627 in Object.wait() [0x000000004637a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e30a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-35" daemon prio=10 tid=0x00007ff0680a7000 nid=0x4626 in Object.wait() [0x0000000046279000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-34" daemon prio=10 tid=0x00007ff068ce8800 nid=0x4625 in Object.wait() [0x0000000046178000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3458> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-33" daemon prio=10 tid=0x00007ff06951e800 nid=0x4624 in Object.wait() [0x0000000046077000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1250> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-32" daemon prio=10 tid=0x00007ff06d6f6000 nid=0x4623 in Object.wait() [0x0000000045f76000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e37d8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-31" daemon prio=10 tid=0x00007ff06d6f4000 nid=0x4622 in Object.wait() [0x0000000045e75000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1608> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-30" daemon prio=10 tid=0x00007ff06c1a9000 nid=0x4621 in Object.wait() [0x0000000045d74000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3b20> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-29" daemon prio=10 tid=0x00007ff06c1a7000 nid=0x4620 in Object.wait() [0x0000000045c73000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374def8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-28" daemon prio=10 tid=0x00007ff06c1a5000 nid=0x461f in Object.wait() [0x0000000045b72000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e240> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-27" daemon prio=10 tid=0x00007ff06c1a3000 nid=0x461e in Object.wait() [0x0000000045a71000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e588> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-26" daemon prio=10 tid=0x00007ff06c1a2800 nid=0x461d in Object.wait() [0x0000000045970000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e940> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-25" daemon prio=10 tid=0x00007ff06c0c0800 nid=0x461c in Object.wait() [0x000000004586f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374eb60> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-24" daemon prio=10 tid=0x00007ff06c0c0000 nid=0x461b in Object.wait() [0x000000004576e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374ee70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-23" daemon prio=10 tid=0x00007ff06d846000 nid=0x461a in Object.wait() [0x000000004566d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f1b8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-22" daemon prio=10 tid=0x00007ff06c3f5800 nid=0x4619 in Object.wait() [0x000000004556c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f500> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-21" daemon prio=10 tid=0x00007ff06c3f3800 nid=0x4618 in Object.wait() [0x000000004546b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e52d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-20" daemon prio=10 tid=0x00007ff06d844800 nid=0x4617 in Object.wait() [0x000000004536a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5618> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-19" daemon prio=10 tid=0x00007ff06d842800 nid=0x4616 in Object.wait() [0x0000000045269000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5960> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-18" daemon prio=10 tid=0x00007ff06d840800 nid=0x4615 in Object.wait() [0x0000000045168000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5d50> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-17" daemon prio=10 tid=0x00007ff06c196800 nid=0x4614 in Object.wait() [0x0000000045067000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-16" daemon prio=10 tid=0x00007ff06c194800 nid=0x4613 in Object.wait() [0x0000000044f66000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1950> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-15" daemon prio=10 tid=0x00007ff06c193000 nid=0x4612 in Object.wait() [0x0000000044e65000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e64c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-14" daemon prio=10 tid=0x00007ff06c191000 nid=0x4611 in Object.wait() [0x0000000044d64000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-13" daemon prio=10 tid=0x00007ff06db01800 nid=0x4610 in Object.wait() [0x0000000044c63000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e81e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-12" daemon prio=10 tid=0x00007ff06daff800 nid=0x460f in Object.wait() [0x0000000044b62000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e85a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-11" daemon prio=10 tid=0x00007ff06dafd800 nid=0x460e in Object.wait() [0x0000000044a61000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e88e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-10" daemon prio=10 tid=0x00007ff06dafc000 nid=0x460d in Object.wait() [0x0000000044960000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8b08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-9" daemon prio=10 tid=0x00007ff06c097000 nid=0x460c in Object.wait() [0x000000004485f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8ef8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-8" daemon prio=10 tid=0x00007ff06c095000 nid=0x460b in Object.wait() [0x000000004475e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6c98> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-7" daemon prio=10 tid=0x00007ff06c093000 nid=0x460a in Object.wait() [0x000000004465d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e9558> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-6" daemon prio=10 tid=0x00007ff06c091000 nid=0x4609 in Object.wait() [0x000000004455c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6d70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-5" daemon prio=10 tid=0x00007ff06c010800 nid=0x4608 in Object.wait() [0x000000004445b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e98a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-4" daemon prio=10 tid=0x00007ff06c00e800 nid=0x4607 in Object.wait() [0x000000004435a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eae28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-3" daemon prio=10 tid=0x00007ff06c015000 nid=0x4606 in Object.wait() [0x0000000044259000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb218> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-2" daemon prio=10 tid=0x00007ff06d7bd000 nid=0x4605 in Object.wait() [0x0000000044158000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb5d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-1" daemon prio=10 tid=0x00007ff06d7bc000 nid=0x4604 in Object.wait() [0x0000000044057000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3e68> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-Acceptor-0" daemon prio=10 tid=0x00007ff06d7b9800 nid=0x4603 runnable [0x0000000043f56000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e2b3660> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007ff06d7af800 nid=0x4602 waiting on condition [0x0000000043e55000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "TP-Monitor" daemon prio=10 tid=0x00007ff06e29c000 nid=0x4601 in Object.wait() [0x0000000043d54000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) > - locked <0x00007ff08372be60> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor4" daemon prio=10 tid=0x00007ff06c293000 nid=0x4600 runnable [0x0000000043c53000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836e14c8> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:307) > at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:661) > at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor3" daemon prio=10 tid=0x00007ff06c0e4000 nid=0x45ff in Object.wait() [0x0000000043b50000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.applyAppender(EventLoggerImpl.java:190) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.logEvent(EventLoggerImpl.java:141) > at sun.reflect.GeneratedMethodAccessor73.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy1.logEvent(Unknown Source) > at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:135) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:143) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor2" daemon prio=10 tid=0x00007ff06c0e8800 nid=0x45fe in Object.wait() [0x0000000043a4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.apache.jackrabbit.core.version.AbstractVersionManager$WriteOperation.save(AbstractVersionManager.java:150) > at org.apache.jackrabbit.core.version.AbstractVersionManager.createVersionHistory(AbstractVersionManager.java:317) > at org.apache.jackrabbit.core.version.VersionManagerImpl$1.run(VersionManagerImpl.java:220) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:567) > - locked <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:499) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy3.obtainEditableInstance(Unknown Source) > at org.hippoecm.frontend.plugins.reviewedactions.FullReviewedActionsWorkflowPlugin$3.execute(FullReviewedActionsWorkflowPlugin.java:137) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) > at org.hippoecm.addon.workflow.MenuAction$1.onClick(MenuAction.java:43) > at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) > at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor1" daemon prio=10 tid=0x00007ff06daa9000 nid=0x45fd in Object.wait() [0x0000000042237000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff0bdd8c778> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.decorating.checked.ItemDecorator.save(ItemDecorator.java:173) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:176) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-8080-Acceptor-0" daemon prio=10 tid=0x00007ff06c0ee000 nid=0x45fc runnable [0x000000004253c000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e28cd70> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x00007ff06c0eb000 nid=0x45fb waiting on condition [0x0000000042e45000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-1099" daemon prio=10 tid=0x00007ff077047800 nid=0x45f7 runnable [0x000000004233a000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff083319458> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "GC Daemon" daemon prio=10 tid=0x00007ff077a11800 nid=0x45f3 in Object.wait() [0x000000004273e000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at sun.misc.GC$Daemon.run(GC.java:100) > - locked <0x00007ff0837e6f90> (a sun.misc.GC$LatencyLock) > "RMI Reaper" prio=10 tid=0x00007ff075853800 nid=0x45f2 in Object.wait() [0x0000000041c4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff0837e71a8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-0" daemon prio=10 tid=0x00007ff077334800 nid=0x45f1 runnable [0x000000004187e000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff08331a5e0> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "HJCRQJS_QuartzSchedulerThread" prio=10 tid=0x00007ff068ce7000 nid=0x45f0 sleeping[0x0000000041b4e000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.quartz.core.QuartzSchedulerThread.run(QuartzSchedulerThread.java:394) > "HJCRQJS_Worker-0" prio=10 tid=0x00007ff068394000 nid=0x45ef in Object.wait() [0x0000000043950000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.quartz.simpl.SimpleThreadPool.getNextRunnable(SimpleThreadPool.java:428) > - locked <0x00007ff082e75448> (a java.lang.Object) > at org.quartz.simpl.SimpleThreadPool.access$000(SimpleThreadPool.java:47) > at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:518) > "RefreshingEventListener" prio=10 tid=0x00007ff068a96000 nid=0x45ee waiting on condition [0x000000004384f000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.hippoecm.repository.RefreshingEventListener$1.run(RefreshingEventListener.java:96) > "ClusterNode-s1720" daemon prio=10 tid=0x00007ff070794800 nid=0x334c in Object.wait() [0x000000004374e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc78> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) > at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) > at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) > at java.lang.Thread.run(Thread.java:619) > "IndexMerger" daemon prio=10 tid=0x00007ff06c05f800 nid=0x7271 in Object.wait() [0x000000004263d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff0813e2858> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "Timer-0" daemon prio=10 tid=0x00007ff06c001000 nid=0x7266 in Object.wait() [0x0000000041594000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.util.TimerThread.mainLoop(Timer.java:509) > - locked <0x00007ff080de49d0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "IndexMerger" daemon prio=10 tid=0x00007ff07794c800 nid=0x7265 in Object.wait() [0x00000000412be000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07f40c0d8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "ObservationManager" daemon prio=10 tid=0x00007ff077076800 nid=0x724d in Object.wait() [0x000000004067f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07eadd8f8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) > at java.lang.Thread.run(Thread.java:619) > "Transient File Reaper" daemon prio=10 tid=0x00007ff07041e800 nid=0x724c in Object.wait() [0x0000000040a39000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) > "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007ff070483000 nid=0x724b in Object.wait() [0x00000000411bd000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.lang.Object.wait(Object.java:485) > at java.util.TimerThread.mainLoop(Timer.java:483) > - locked <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "Low Memory Detector" daemon prio=10 tid=0x00007ff070004000 nid=0x7240 runnable [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread1" daemon prio=10 tid=0x00007ff070001000 nid=0x723f waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread0" daemon prio=10 tid=0x00007ff077aa7800 nid=0x723e waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Signal Dispatcher" daemon prio=10 tid=0x00007ff077aa5800 nid=0x723d waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Finalizer" daemon prio=10 tid=0x00007ff077f29800 nid=0x723a in Object.wait() [0x0000000042138000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e214fe8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159) > "Reference Handler" daemon prio=10 tid=0x00007ff077f22000 nid=0x7239 in Object.wait() [0x0000000040fbb000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) > - locked <0x00007ff07e214fb0> (a java.lang.ref.Reference$Lock) > "main" prio=10 tid=0x0000000040113800 nid=0x722e runnable [0x0000000040836000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836f5d60> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.catalina.core.StandardServer.await(StandardServer.java:389) > at org.apache.catalina.startup.Catalina.await(Catalina.java:647) > at org.apache.catalina.startup.Catalina.start(Catalina.java:607) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) > at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) > "VM Thread" prio=10 tid=0x00007ff077f1b000 nid=0x7237 runnable > "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x722f runnable > "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x7230 runnable > "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121800 nid=0x7231 runnable > "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x7232 runnable > "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x7233 runnable > "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040127000 nid=0x7234 runnable > "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x7235 runnable > "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x7236 runnable > "VM Periodic Task Thread" prio=10 tid=0x00007ff070007000 nid=0x7241 waiting on condition > JNI global references: 1147 > Heap > PSYoungGen total 670528K, used 301659K [0x00007ff128b90000, 0x00007ff161a80000, 0x00007ff17e0e0000) > eden space 592512K, 37% used [0x00007ff128b90000,0x00007ff136605ee8,0x00007ff14ce30000) > from space 78016K, 99% used [0x00007ff158160000,0x00007ff15cd81020,0x00007ff15cd90000) > to space 78784K, 0% used [0x00007ff15cd90000,0x00007ff15cd90000,0x00007ff161a80000) > PSOldGen total 1465344K, used 1096343K [0x00007ff07e0e0000, 0x00007ff0d77e0000, 0x00007ff128b90000) > object space 1465344K, 74% used [0x00007ff07e0e0000,0x00007ff0c0f85ea0,0x00007ff0d77e0000) > PSPermGen total 54976K, used 54410K [0x00007ff078ce0000, 0x00007ff07c290000, 0x00007ff07e0e0000) > object space 54976K, 98% used [0x00007ff078ce0000,0x00007ff07c2028f0,0x00007ff07c290000) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 16 14:56:33 2010 From: svn-logs at hippocms.org (bvdschans) Date: Tue Mar 16 15:01:19 2010 Subject: [HippoRepos-dev] [22144] hippo-ecm: HREPTWO-16: Tweak down logging Message-ID: <20100316135633.A26B61C020@svn.vm.castaserver.com> Revision: 22144 Author: bvdschans Date: 2010-03-16 14:56:33 +0100 (Tue, 16 Mar 2010) Log Message: ----------- HREPTWO-16: Tweak down logging Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 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 2010-03-15 18:41:36 UTC (rev 22143) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-16 13:56:33 UTC (rev 22144) @@ -418,7 +418,9 @@ try { id = getNodeId(absPath); } catch (PathNotFoundException e) { - log.warn("Unable to find node id, allowing read permissions: {}", e.getMessage()); + // this usually happens in clustered environments when the node has been + // deleted before the cluster addnode event is received. + log.info("Unable to find node id, allowing read permissions: {}", e.getMessage()); log.debug("Stacktrace: ", e); return true; } From svn-logs at hippocms.org Tue Mar 16 14:57:49 2010 From: svn-logs at hippocms.org (bvdschans) Date: Tue Mar 16 15:02:35 2010 Subject: [HippoRepos-dev] [22145] hippo-ecm: HREPTWO-16: Tweak down logging Message-ID: <20100316135749.593A51C020@svn.vm.castaserver.com> Revision: 22145 Author: bvdschans Date: 2010-03-16 14:57:48 +0100 (Tue, 16 Mar 2010) Log Message: ----------- HREPTWO-16: Tweak down logging Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-16 13:56:33 UTC (rev 22144) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-16 13:57:48 UTC (rev 22145) @@ -418,7 +418,9 @@ try { id = getNodeId(absPath); } catch (PathNotFoundException e) { - log.warn("Unable to find node id, allowing read permissions: {}", e.getMessage()); + // this usually happens in clustered environments when the node has been + // deleted before the cluster addnode event is received. + log.info("Unable to find node id, allowing read permissions: {}", e.getMessage()); log.debug("Stacktrace: ", e); return true; } From svn-logs at hippocms.org Tue Mar 16 14:58:49 2010 From: svn-logs at hippocms.org (bvdschans) Date: Tue Mar 16 15:03:34 2010 Subject: [HippoRepos-dev] [22146] hippo-ecm: HREPTWO-16: Tweak down logging Message-ID: <20100316135849.41F5E1C020@svn.vm.castaserver.com> Revision: 22146 Author: bvdschans Date: 2010-03-16 14:58:48 +0100 (Tue, 16 Mar 2010) Log Message: ----------- HREPTWO-16: Tweak down logging Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-16 13:57:48 UTC (rev 22145) +++ hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-16 13:58:48 UTC (rev 22146) @@ -418,7 +418,9 @@ try { id = getNodeId(absPath); } catch (PathNotFoundException e) { - log.warn("Unable to find node id, allowing read permissions: {}", e.getMessage()); + // this usually happens in clustered environments when the node has been + // deleted before the cluster addnode event is received. + log.info("Unable to find node id, allowing read permissions: {}", e.getMessage()); log.debug("Stacktrace: ", e); return true; } From helpdesk at onehippo.com Tue Mar 16 15:26:48 2010 From: helpdesk at onehippo.com (JIRA (Jettro Coenradie)) Date: Tue Mar 16 15:31:31 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3979) Log level of html cleaner is too high and it logs too much Message-ID: <6072132.6085.1268749608486.JavaMail.jira@jira.vm.castaserver.com> Log level of html cleaner is too high and it logs too much ---------------------------------------------------------- Key: HREPTWO-3979 URL: http://issues.onehippo.com/browse/HREPTWO-3979 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Reporter: Jettro Coenradie Complete content and stacktrace is logged when the cleaner cannot parse the content. Mar 16 15:17:24 s1718 2010-03-16 15:17:24,267 ERROR [TP-Processor1] org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin - Exception caught during editor creation while cleaning value: Mar 16 15:17:24 s1718 org.xml.sax.SAXException: Reached end of input without encountering opening body tag. Mar 16 15:17:24 s1718 at nl.hippo.htmlcleaner.HtmlRepairer$Cleaner.elementCleanup(HtmlRepairer.java:267) Mar 16 15:17:24 s1718 at nl.hippo.htmlcleaner.HtmlRepairer$Cleaner.clean(HtmlRepairer.java:127) Mar 16 15:17:24 s1718 at nl.hippo.htmlcleaner.HtmlRepairer$Cleaner.access$000(HtmlRepairer.java:108) Mar 16 15:17:24 s1718 at nl.hippo.htmlcleaner.HtmlRepairer.clean(HtmlRepairer.java:105) Mar 16 15:17:24 s1718 at nl.hippo.htmlcleaner.HtmlCleaner.clean(HtmlCleaner.java:51) Mar 16 15:17:24 s1718 at nl.hippo.htmlcleaner.HtmlCleaner.cleanToString(HtmlCleaner.java:62) Mar 16 15:17:24 s1718 at org.hippoecm.frontend.plugins.xinha.htmlcleaner.HtmlCleanerPlugin.clean(HtmlCleanerPlugin.java:62) Mar 16 15:17:24 s1718 at org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin.clean(AbstractXinhaPlugin.java:321) Mar 16 15:17:24 s1718 at org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin$XinhaModel.setObject(AbstractXinhaPlugin.java:347) Mar 16 15:17:24 s1718 at org.apache.wicket.Component.setDefaultModelObject(Component.java:3043) Mar 16 15:17:24 s1718 at org.apache.wicket.markup.html.form.FormComponent.updateModel(FormComponent.java:1168) Mar 16 15:17:24 s1718 at org.apache.wicket.markup.html.form.FormComponent.processInput(FormComponent.java:1049) Mar 16 15:17:24 s1718 at org.hippoecm.frontend.plugins.xinha.AbstractXinhaPlugin$XinhaTextArea$1.respond(AbstractXinhaPlugin.java:380) Mar 16 15:17:24 s1718 at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) Mar 16 15:17:24 s1718 at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) Mar 16 15:17:24 s1718 at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) Mar 16 15:17:24 s1718 at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) Mar 16 15:17:24 s1718 at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) Mar 16 15:17:24 s1718 at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) Mar 16 15:17:24 s1718 at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) Mar 16 15:17:24 s1718 at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) Mar 16 15:17:24 s1718 at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) Mar 16 15:17:24 s1718 at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) Mar 16 15:17:24 s1718 at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) Mar 16 15:17:24 s1718 at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) Mar 16 15:17:24 s1718 at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) Mar 16 15:17:24 s1718 at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) Mar 16 15:17:24 s1718 at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) Mar 16 15:17:24 s1718 at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) Mar 16 15:17:24 s1718 at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) Mar 16 15:17:24 s1718 at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) Mar 16 15:17:24 s1718 at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) Mar 16 15:17:24 s1718 at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128) Mar 16 15:17:24 s1718 at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) Mar 16 15:17:24 s1718 at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) Mar 16 15:17:24 s1718 at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293) Mar 16 15:17:24 s1718 at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) Mar 16 15:17:24 s1718 at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) Mar 16 15:17:24 s1718 at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) Mar 16 15:17:24 s1718 at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) Mar 16 15:17:24 s1718 at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) Mar 16 15:17:24 s1718 at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) Mar 16 15:17:24 s1718 at java.lang.Thread.run(Thread.java:619) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 15:44:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 16 15:49:32 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3978) Deadlock in version storage - VersionManagerImpl In-Reply-To: <28596032.5996.1268746908566.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <12599211.6147.1268750688818.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3978?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3978: ------------------------------------ Assignee: Berry van Halderen Fix Version/s: r2.12.08 r2.13.00 > Deadlock in version storage - VersionManagerImpl > ------------------------------------------------ > > Key: HREPTWO-3978 > URL: http://issues.onehippo.com/browse/HREPTWO-3978 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jettro Coenradie > Assignee: Berry van Halderen > Priority: High > Fix For: r2.12.08, r2.13.00 > > > During concurrent cms usage we encountered a deadlock situation. The following output was obtained using a kill -3 on the tomcat server > "TP-Processor5" daemon prio=10 tid=0x00007ff076f43000 nid=0x48a3 waiting for monitor entry [0x000000004354a000] > java.lang.Thread.State: BLOCKED (on object monitor) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:565) > - waiting to lock <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff09b34eb80> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:232) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:161) > at sun.reflect.GeneratedMethodAccessor89.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff09b44a230> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy6.add(Unknown Source) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:263) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:237) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.onOk(CompatibilityWorkflowPlugin.java:200) > at org.hippoecm.frontend.dialog.AbstractDialog.handleSubmit(AbstractDialog.java:526) > at org.hippoecm.frontend.dialog.AbstractDialog$2.onSubmit(AbstractDialog.java:395) > at org.hippoecm.frontend.dialog.AbstractDialog$ButtonWrapper$1.onSubmit(AbstractDialog.java:265) > at org.apache.wicket.ajax.markup.html.form.AjaxButton$1.onSubmit(AjaxButton.java:102) > at org.apache.wicket.ajax.form.AjaxFormSubmitBehavior.onEvent(AjaxFormSubmitBehavior.java:143) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-50" daemon prio=10 tid=0x00007ff068245000 nid=0x4635 in Object.wait() [0x0000000047188000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d94a8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-49" daemon prio=10 tid=0x00007ff068c37000 nid=0x4634 in Object.wait() [0x0000000047087000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d67b0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-48" daemon prio=10 tid=0x00007ff068c35000 nid=0x4633 in Object.wait() [0x0000000046f86000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9850> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-47" daemon prio=10 tid=0x00007ff068ceb800 nid=0x4632 in Object.wait() [0x0000000046e85000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6af8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-46" daemon prio=10 tid=0x00007ff068cea000 nid=0x4631 in Object.wait() [0x0000000046d84000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6eb0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-45" daemon prio=10 tid=0x00007ff068dcc000 nid=0x4630 in Object.wait() [0x0000000046c83000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9c08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-44" daemon prio=10 tid=0x00007ff0683ee000 nid=0x462f in Object.wait() [0x0000000046b82000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9e28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-43" daemon prio=10 tid=0x00007ff0683ec000 nid=0x462e in Object.wait() [0x0000000046a81000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-42" daemon prio=10 tid=0x00007ff068c04800 nid=0x462d in Object.wait() [0x0000000046980000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e04c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-41" daemon prio=10 tid=0x00007ff068ab5800 nid=0x462c in Object.wait() [0x000000004687f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e27f0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-40" daemon prio=10 tid=0x00007ff068ab3800 nid=0x462b in Object.wait() [0x000000004677e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-39" daemon prio=10 tid=0x00007ff068dc9000 nid=0x462a in Object.wait() [0x000000004667d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2b38> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-38" daemon prio=10 tid=0x00007ff0699b2800 nid=0x4629 in Object.wait() [0x000000004657c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2d58> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-37" daemon prio=10 tid=0x00007ff068c38800 nid=0x4628 in Object.wait() [0x000000004647b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0bc0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-36" daemon prio=10 tid=0x00007ff069a98800 nid=0x4627 in Object.wait() [0x000000004637a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e30a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-35" daemon prio=10 tid=0x00007ff0680a7000 nid=0x4626 in Object.wait() [0x0000000046279000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-34" daemon prio=10 tid=0x00007ff068ce8800 nid=0x4625 in Object.wait() [0x0000000046178000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3458> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-33" daemon prio=10 tid=0x00007ff06951e800 nid=0x4624 in Object.wait() [0x0000000046077000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1250> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-32" daemon prio=10 tid=0x00007ff06d6f6000 nid=0x4623 in Object.wait() [0x0000000045f76000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e37d8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-31" daemon prio=10 tid=0x00007ff06d6f4000 nid=0x4622 in Object.wait() [0x0000000045e75000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1608> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-30" daemon prio=10 tid=0x00007ff06c1a9000 nid=0x4621 in Object.wait() [0x0000000045d74000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3b20> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-29" daemon prio=10 tid=0x00007ff06c1a7000 nid=0x4620 in Object.wait() [0x0000000045c73000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374def8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-28" daemon prio=10 tid=0x00007ff06c1a5000 nid=0x461f in Object.wait() [0x0000000045b72000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e240> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-27" daemon prio=10 tid=0x00007ff06c1a3000 nid=0x461e in Object.wait() [0x0000000045a71000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e588> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-26" daemon prio=10 tid=0x00007ff06c1a2800 nid=0x461d in Object.wait() [0x0000000045970000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e940> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-25" daemon prio=10 tid=0x00007ff06c0c0800 nid=0x461c in Object.wait() [0x000000004586f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374eb60> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-24" daemon prio=10 tid=0x00007ff06c0c0000 nid=0x461b in Object.wait() [0x000000004576e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374ee70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-23" daemon prio=10 tid=0x00007ff06d846000 nid=0x461a in Object.wait() [0x000000004566d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f1b8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-22" daemon prio=10 tid=0x00007ff06c3f5800 nid=0x4619 in Object.wait() [0x000000004556c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f500> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-21" daemon prio=10 tid=0x00007ff06c3f3800 nid=0x4618 in Object.wait() [0x000000004546b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e52d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-20" daemon prio=10 tid=0x00007ff06d844800 nid=0x4617 in Object.wait() [0x000000004536a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5618> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-19" daemon prio=10 tid=0x00007ff06d842800 nid=0x4616 in Object.wait() [0x0000000045269000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5960> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-18" daemon prio=10 tid=0x00007ff06d840800 nid=0x4615 in Object.wait() [0x0000000045168000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5d50> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-17" daemon prio=10 tid=0x00007ff06c196800 nid=0x4614 in Object.wait() [0x0000000045067000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-16" daemon prio=10 tid=0x00007ff06c194800 nid=0x4613 in Object.wait() [0x0000000044f66000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1950> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-15" daemon prio=10 tid=0x00007ff06c193000 nid=0x4612 in Object.wait() [0x0000000044e65000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e64c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-14" daemon prio=10 tid=0x00007ff06c191000 nid=0x4611 in Object.wait() [0x0000000044d64000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-13" daemon prio=10 tid=0x00007ff06db01800 nid=0x4610 in Object.wait() [0x0000000044c63000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e81e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-12" daemon prio=10 tid=0x00007ff06daff800 nid=0x460f in Object.wait() [0x0000000044b62000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e85a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-11" daemon prio=10 tid=0x00007ff06dafd800 nid=0x460e in Object.wait() [0x0000000044a61000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e88e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-10" daemon prio=10 tid=0x00007ff06dafc000 nid=0x460d in Object.wait() [0x0000000044960000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8b08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-9" daemon prio=10 tid=0x00007ff06c097000 nid=0x460c in Object.wait() [0x000000004485f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8ef8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-8" daemon prio=10 tid=0x00007ff06c095000 nid=0x460b in Object.wait() [0x000000004475e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6c98> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-7" daemon prio=10 tid=0x00007ff06c093000 nid=0x460a in Object.wait() [0x000000004465d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e9558> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-6" daemon prio=10 tid=0x00007ff06c091000 nid=0x4609 in Object.wait() [0x000000004455c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6d70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-5" daemon prio=10 tid=0x00007ff06c010800 nid=0x4608 in Object.wait() [0x000000004445b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e98a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-4" daemon prio=10 tid=0x00007ff06c00e800 nid=0x4607 in Object.wait() [0x000000004435a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eae28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-3" daemon prio=10 tid=0x00007ff06c015000 nid=0x4606 in Object.wait() [0x0000000044259000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb218> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-2" daemon prio=10 tid=0x00007ff06d7bd000 nid=0x4605 in Object.wait() [0x0000000044158000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb5d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-1" daemon prio=10 tid=0x00007ff06d7bc000 nid=0x4604 in Object.wait() [0x0000000044057000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3e68> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-Acceptor-0" daemon prio=10 tid=0x00007ff06d7b9800 nid=0x4603 runnable [0x0000000043f56000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e2b3660> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007ff06d7af800 nid=0x4602 waiting on condition [0x0000000043e55000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "TP-Monitor" daemon prio=10 tid=0x00007ff06e29c000 nid=0x4601 in Object.wait() [0x0000000043d54000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) > - locked <0x00007ff08372be60> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor4" daemon prio=10 tid=0x00007ff06c293000 nid=0x4600 runnable [0x0000000043c53000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836e14c8> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:307) > at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:661) > at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor3" daemon prio=10 tid=0x00007ff06c0e4000 nid=0x45ff in Object.wait() [0x0000000043b50000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.applyAppender(EventLoggerImpl.java:190) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.logEvent(EventLoggerImpl.java:141) > at sun.reflect.GeneratedMethodAccessor73.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy1.logEvent(Unknown Source) > at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:135) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:143) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor2" daemon prio=10 tid=0x00007ff06c0e8800 nid=0x45fe in Object.wait() [0x0000000043a4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.apache.jackrabbit.core.version.AbstractVersionManager$WriteOperation.save(AbstractVersionManager.java:150) > at org.apache.jackrabbit.core.version.AbstractVersionManager.createVersionHistory(AbstractVersionManager.java:317) > at org.apache.jackrabbit.core.version.VersionManagerImpl$1.run(VersionManagerImpl.java:220) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:567) > - locked <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:499) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy3.obtainEditableInstance(Unknown Source) > at org.hippoecm.frontend.plugins.reviewedactions.FullReviewedActionsWorkflowPlugin$3.execute(FullReviewedActionsWorkflowPlugin.java:137) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) > at org.hippoecm.addon.workflow.MenuAction$1.onClick(MenuAction.java:43) > at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) > at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor1" daemon prio=10 tid=0x00007ff06daa9000 nid=0x45fd in Object.wait() [0x0000000042237000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff0bdd8c778> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.decorating.checked.ItemDecorator.save(ItemDecorator.java:173) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:176) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-8080-Acceptor-0" daemon prio=10 tid=0x00007ff06c0ee000 nid=0x45fc runnable [0x000000004253c000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e28cd70> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x00007ff06c0eb000 nid=0x45fb waiting on condition [0x0000000042e45000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-1099" daemon prio=10 tid=0x00007ff077047800 nid=0x45f7 runnable [0x000000004233a000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff083319458> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "GC Daemon" daemon prio=10 tid=0x00007ff077a11800 nid=0x45f3 in Object.wait() [0x000000004273e000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at sun.misc.GC$Daemon.run(GC.java:100) > - locked <0x00007ff0837e6f90> (a sun.misc.GC$LatencyLock) > "RMI Reaper" prio=10 tid=0x00007ff075853800 nid=0x45f2 in Object.wait() [0x0000000041c4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff0837e71a8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-0" daemon prio=10 tid=0x00007ff077334800 nid=0x45f1 runnable [0x000000004187e000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff08331a5e0> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "HJCRQJS_QuartzSchedulerThread" prio=10 tid=0x00007ff068ce7000 nid=0x45f0 sleeping[0x0000000041b4e000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.quartz.core.QuartzSchedulerThread.run(QuartzSchedulerThread.java:394) > "HJCRQJS_Worker-0" prio=10 tid=0x00007ff068394000 nid=0x45ef in Object.wait() [0x0000000043950000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.quartz.simpl.SimpleThreadPool.getNextRunnable(SimpleThreadPool.java:428) > - locked <0x00007ff082e75448> (a java.lang.Object) > at org.quartz.simpl.SimpleThreadPool.access$000(SimpleThreadPool.java:47) > at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:518) > "RefreshingEventListener" prio=10 tid=0x00007ff068a96000 nid=0x45ee waiting on condition [0x000000004384f000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.hippoecm.repository.RefreshingEventListener$1.run(RefreshingEventListener.java:96) > "ClusterNode-s1720" daemon prio=10 tid=0x00007ff070794800 nid=0x334c in Object.wait() [0x000000004374e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc78> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) > at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) > at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) > at java.lang.Thread.run(Thread.java:619) > "IndexMerger" daemon prio=10 tid=0x00007ff06c05f800 nid=0x7271 in Object.wait() [0x000000004263d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff0813e2858> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "Timer-0" daemon prio=10 tid=0x00007ff06c001000 nid=0x7266 in Object.wait() [0x0000000041594000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.util.TimerThread.mainLoop(Timer.java:509) > - locked <0x00007ff080de49d0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "IndexMerger" daemon prio=10 tid=0x00007ff07794c800 nid=0x7265 in Object.wait() [0x00000000412be000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07f40c0d8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "ObservationManager" daemon prio=10 tid=0x00007ff077076800 nid=0x724d in Object.wait() [0x000000004067f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07eadd8f8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) > at java.lang.Thread.run(Thread.java:619) > "Transient File Reaper" daemon prio=10 tid=0x00007ff07041e800 nid=0x724c in Object.wait() [0x0000000040a39000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) > "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007ff070483000 nid=0x724b in Object.wait() [0x00000000411bd000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.lang.Object.wait(Object.java:485) > at java.util.TimerThread.mainLoop(Timer.java:483) > - locked <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "Low Memory Detector" daemon prio=10 tid=0x00007ff070004000 nid=0x7240 runnable [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread1" daemon prio=10 tid=0x00007ff070001000 nid=0x723f waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread0" daemon prio=10 tid=0x00007ff077aa7800 nid=0x723e waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Signal Dispatcher" daemon prio=10 tid=0x00007ff077aa5800 nid=0x723d waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Finalizer" daemon prio=10 tid=0x00007ff077f29800 nid=0x723a in Object.wait() [0x0000000042138000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e214fe8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159) > "Reference Handler" daemon prio=10 tid=0x00007ff077f22000 nid=0x7239 in Object.wait() [0x0000000040fbb000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) > - locked <0x00007ff07e214fb0> (a java.lang.ref.Reference$Lock) > "main" prio=10 tid=0x0000000040113800 nid=0x722e runnable [0x0000000040836000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836f5d60> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.catalina.core.StandardServer.await(StandardServer.java:389) > at org.apache.catalina.startup.Catalina.await(Catalina.java:647) > at org.apache.catalina.startup.Catalina.start(Catalina.java:607) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) > at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) > "VM Thread" prio=10 tid=0x00007ff077f1b000 nid=0x7237 runnable > "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x722f runnable > "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x7230 runnable > "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121800 nid=0x7231 runnable > "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x7232 runnable > "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x7233 runnable > "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040127000 nid=0x7234 runnable > "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x7235 runnable > "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x7236 runnable > "VM Periodic Task Thread" prio=10 tid=0x00007ff070007000 nid=0x7241 waiting on condition > JNI global references: 1147 > Heap > PSYoungGen total 670528K, used 301659K [0x00007ff128b90000, 0x00007ff161a80000, 0x00007ff17e0e0000) > eden space 592512K, 37% used [0x00007ff128b90000,0x00007ff136605ee8,0x00007ff14ce30000) > from space 78016K, 99% used [0x00007ff158160000,0x00007ff15cd81020,0x00007ff15cd90000) > to space 78784K, 0% used [0x00007ff15cd90000,0x00007ff15cd90000,0x00007ff161a80000) > PSOldGen total 1465344K, used 1096343K [0x00007ff07e0e0000, 0x00007ff0d77e0000, 0x00007ff128b90000) > object space 1465344K, 74% used [0x00007ff07e0e0000,0x00007ff0c0f85ea0,0x00007ff0d77e0000) > PSPermGen total 54976K, used 54410K [0x00007ff078ce0000, 0x00007ff07c290000, 0x00007ff07e0e0000) > object space 54976K, 98% used [0x00007ff078ce0000,0x00007ff07c2028f0,0x00007ff07c290000) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 15:44:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Tue Mar 16 15:49:36 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3978) Deadlock in version storage - VersionManagerImpl In-Reply-To: <28596032.5996.1268746908566.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <25152245.6150.1268750688987.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3978?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3978: ------------------------------------ Priority: Top (was: High) > Deadlock in version storage - VersionManagerImpl > ------------------------------------------------ > > Key: HREPTWO-3978 > URL: http://issues.onehippo.com/browse/HREPTWO-3978 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jettro Coenradie > Assignee: Berry van Halderen > Priority: Top > Fix For: r2.12.08, r2.13.00 > > > During concurrent cms usage we encountered a deadlock situation. The following output was obtained using a kill -3 on the tomcat server > "TP-Processor5" daemon prio=10 tid=0x00007ff076f43000 nid=0x48a3 waiting for monitor entry [0x000000004354a000] > java.lang.Thread.State: BLOCKED (on object monitor) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:565) > - waiting to lock <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff09b34eb80> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:232) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:161) > at sun.reflect.GeneratedMethodAccessor89.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff09b44a230> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy6.add(Unknown Source) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:263) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:237) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.onOk(CompatibilityWorkflowPlugin.java:200) > at org.hippoecm.frontend.dialog.AbstractDialog.handleSubmit(AbstractDialog.java:526) > at org.hippoecm.frontend.dialog.AbstractDialog$2.onSubmit(AbstractDialog.java:395) > at org.hippoecm.frontend.dialog.AbstractDialog$ButtonWrapper$1.onSubmit(AbstractDialog.java:265) > at org.apache.wicket.ajax.markup.html.form.AjaxButton$1.onSubmit(AjaxButton.java:102) > at org.apache.wicket.ajax.form.AjaxFormSubmitBehavior.onEvent(AjaxFormSubmitBehavior.java:143) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-50" daemon prio=10 tid=0x00007ff068245000 nid=0x4635 in Object.wait() [0x0000000047188000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d94a8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-49" daemon prio=10 tid=0x00007ff068c37000 nid=0x4634 in Object.wait() [0x0000000047087000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d67b0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-48" daemon prio=10 tid=0x00007ff068c35000 nid=0x4633 in Object.wait() [0x0000000046f86000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9850> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-47" daemon prio=10 tid=0x00007ff068ceb800 nid=0x4632 in Object.wait() [0x0000000046e85000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6af8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-46" daemon prio=10 tid=0x00007ff068cea000 nid=0x4631 in Object.wait() [0x0000000046d84000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6eb0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-45" daemon prio=10 tid=0x00007ff068dcc000 nid=0x4630 in Object.wait() [0x0000000046c83000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9c08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-44" daemon prio=10 tid=0x00007ff0683ee000 nid=0x462f in Object.wait() [0x0000000046b82000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9e28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-43" daemon prio=10 tid=0x00007ff0683ec000 nid=0x462e in Object.wait() [0x0000000046a81000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-42" daemon prio=10 tid=0x00007ff068c04800 nid=0x462d in Object.wait() [0x0000000046980000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e04c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-41" daemon prio=10 tid=0x00007ff068ab5800 nid=0x462c in Object.wait() [0x000000004687f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e27f0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-40" daemon prio=10 tid=0x00007ff068ab3800 nid=0x462b in Object.wait() [0x000000004677e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-39" daemon prio=10 tid=0x00007ff068dc9000 nid=0x462a in Object.wait() [0x000000004667d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2b38> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-38" daemon prio=10 tid=0x00007ff0699b2800 nid=0x4629 in Object.wait() [0x000000004657c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2d58> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-37" daemon prio=10 tid=0x00007ff068c38800 nid=0x4628 in Object.wait() [0x000000004647b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0bc0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-36" daemon prio=10 tid=0x00007ff069a98800 nid=0x4627 in Object.wait() [0x000000004637a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e30a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-35" daemon prio=10 tid=0x00007ff0680a7000 nid=0x4626 in Object.wait() [0x0000000046279000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-34" daemon prio=10 tid=0x00007ff068ce8800 nid=0x4625 in Object.wait() [0x0000000046178000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3458> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-33" daemon prio=10 tid=0x00007ff06951e800 nid=0x4624 in Object.wait() [0x0000000046077000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1250> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-32" daemon prio=10 tid=0x00007ff06d6f6000 nid=0x4623 in Object.wait() [0x0000000045f76000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e37d8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-31" daemon prio=10 tid=0x00007ff06d6f4000 nid=0x4622 in Object.wait() [0x0000000045e75000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1608> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-30" daemon prio=10 tid=0x00007ff06c1a9000 nid=0x4621 in Object.wait() [0x0000000045d74000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3b20> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-29" daemon prio=10 tid=0x00007ff06c1a7000 nid=0x4620 in Object.wait() [0x0000000045c73000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374def8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-28" daemon prio=10 tid=0x00007ff06c1a5000 nid=0x461f in Object.wait() [0x0000000045b72000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e240> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-27" daemon prio=10 tid=0x00007ff06c1a3000 nid=0x461e in Object.wait() [0x0000000045a71000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e588> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-26" daemon prio=10 tid=0x00007ff06c1a2800 nid=0x461d in Object.wait() [0x0000000045970000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e940> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-25" daemon prio=10 tid=0x00007ff06c0c0800 nid=0x461c in Object.wait() [0x000000004586f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374eb60> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-24" daemon prio=10 tid=0x00007ff06c0c0000 nid=0x461b in Object.wait() [0x000000004576e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374ee70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-23" daemon prio=10 tid=0x00007ff06d846000 nid=0x461a in Object.wait() [0x000000004566d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f1b8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-22" daemon prio=10 tid=0x00007ff06c3f5800 nid=0x4619 in Object.wait() [0x000000004556c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f500> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-21" daemon prio=10 tid=0x00007ff06c3f3800 nid=0x4618 in Object.wait() [0x000000004546b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e52d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-20" daemon prio=10 tid=0x00007ff06d844800 nid=0x4617 in Object.wait() [0x000000004536a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5618> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-19" daemon prio=10 tid=0x00007ff06d842800 nid=0x4616 in Object.wait() [0x0000000045269000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5960> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-18" daemon prio=10 tid=0x00007ff06d840800 nid=0x4615 in Object.wait() [0x0000000045168000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5d50> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-17" daemon prio=10 tid=0x00007ff06c196800 nid=0x4614 in Object.wait() [0x0000000045067000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-16" daemon prio=10 tid=0x00007ff06c194800 nid=0x4613 in Object.wait() [0x0000000044f66000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1950> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-15" daemon prio=10 tid=0x00007ff06c193000 nid=0x4612 in Object.wait() [0x0000000044e65000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e64c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-14" daemon prio=10 tid=0x00007ff06c191000 nid=0x4611 in Object.wait() [0x0000000044d64000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-13" daemon prio=10 tid=0x00007ff06db01800 nid=0x4610 in Object.wait() [0x0000000044c63000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e81e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-12" daemon prio=10 tid=0x00007ff06daff800 nid=0x460f in Object.wait() [0x0000000044b62000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e85a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-11" daemon prio=10 tid=0x00007ff06dafd800 nid=0x460e in Object.wait() [0x0000000044a61000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e88e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-10" daemon prio=10 tid=0x00007ff06dafc000 nid=0x460d in Object.wait() [0x0000000044960000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8b08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-9" daemon prio=10 tid=0x00007ff06c097000 nid=0x460c in Object.wait() [0x000000004485f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8ef8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-8" daemon prio=10 tid=0x00007ff06c095000 nid=0x460b in Object.wait() [0x000000004475e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6c98> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-7" daemon prio=10 tid=0x00007ff06c093000 nid=0x460a in Object.wait() [0x000000004465d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e9558> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-6" daemon prio=10 tid=0x00007ff06c091000 nid=0x4609 in Object.wait() [0x000000004455c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6d70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-5" daemon prio=10 tid=0x00007ff06c010800 nid=0x4608 in Object.wait() [0x000000004445b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e98a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-4" daemon prio=10 tid=0x00007ff06c00e800 nid=0x4607 in Object.wait() [0x000000004435a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eae28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-3" daemon prio=10 tid=0x00007ff06c015000 nid=0x4606 in Object.wait() [0x0000000044259000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb218> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-2" daemon prio=10 tid=0x00007ff06d7bd000 nid=0x4605 in Object.wait() [0x0000000044158000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb5d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-1" daemon prio=10 tid=0x00007ff06d7bc000 nid=0x4604 in Object.wait() [0x0000000044057000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3e68> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-Acceptor-0" daemon prio=10 tid=0x00007ff06d7b9800 nid=0x4603 runnable [0x0000000043f56000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e2b3660> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007ff06d7af800 nid=0x4602 waiting on condition [0x0000000043e55000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "TP-Monitor" daemon prio=10 tid=0x00007ff06e29c000 nid=0x4601 in Object.wait() [0x0000000043d54000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) > - locked <0x00007ff08372be60> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor4" daemon prio=10 tid=0x00007ff06c293000 nid=0x4600 runnable [0x0000000043c53000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836e14c8> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:307) > at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:661) > at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor3" daemon prio=10 tid=0x00007ff06c0e4000 nid=0x45ff in Object.wait() [0x0000000043b50000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.applyAppender(EventLoggerImpl.java:190) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.logEvent(EventLoggerImpl.java:141) > at sun.reflect.GeneratedMethodAccessor73.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy1.logEvent(Unknown Source) > at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:135) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:143) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor2" daemon prio=10 tid=0x00007ff06c0e8800 nid=0x45fe in Object.wait() [0x0000000043a4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.apache.jackrabbit.core.version.AbstractVersionManager$WriteOperation.save(AbstractVersionManager.java:150) > at org.apache.jackrabbit.core.version.AbstractVersionManager.createVersionHistory(AbstractVersionManager.java:317) > at org.apache.jackrabbit.core.version.VersionManagerImpl$1.run(VersionManagerImpl.java:220) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:567) > - locked <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:499) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy3.obtainEditableInstance(Unknown Source) > at org.hippoecm.frontend.plugins.reviewedactions.FullReviewedActionsWorkflowPlugin$3.execute(FullReviewedActionsWorkflowPlugin.java:137) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) > at org.hippoecm.addon.workflow.MenuAction$1.onClick(MenuAction.java:43) > at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) > at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor1" daemon prio=10 tid=0x00007ff06daa9000 nid=0x45fd in Object.wait() [0x0000000042237000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff0bdd8c778> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.decorating.checked.ItemDecorator.save(ItemDecorator.java:173) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:176) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-8080-Acceptor-0" daemon prio=10 tid=0x00007ff06c0ee000 nid=0x45fc runnable [0x000000004253c000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e28cd70> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x00007ff06c0eb000 nid=0x45fb waiting on condition [0x0000000042e45000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-1099" daemon prio=10 tid=0x00007ff077047800 nid=0x45f7 runnable [0x000000004233a000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff083319458> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "GC Daemon" daemon prio=10 tid=0x00007ff077a11800 nid=0x45f3 in Object.wait() [0x000000004273e000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at sun.misc.GC$Daemon.run(GC.java:100) > - locked <0x00007ff0837e6f90> (a sun.misc.GC$LatencyLock) > "RMI Reaper" prio=10 tid=0x00007ff075853800 nid=0x45f2 in Object.wait() [0x0000000041c4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff0837e71a8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-0" daemon prio=10 tid=0x00007ff077334800 nid=0x45f1 runnable [0x000000004187e000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff08331a5e0> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "HJCRQJS_QuartzSchedulerThread" prio=10 tid=0x00007ff068ce7000 nid=0x45f0 sleeping[0x0000000041b4e000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.quartz.core.QuartzSchedulerThread.run(QuartzSchedulerThread.java:394) > "HJCRQJS_Worker-0" prio=10 tid=0x00007ff068394000 nid=0x45ef in Object.wait() [0x0000000043950000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.quartz.simpl.SimpleThreadPool.getNextRunnable(SimpleThreadPool.java:428) > - locked <0x00007ff082e75448> (a java.lang.Object) > at org.quartz.simpl.SimpleThreadPool.access$000(SimpleThreadPool.java:47) > at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:518) > "RefreshingEventListener" prio=10 tid=0x00007ff068a96000 nid=0x45ee waiting on condition [0x000000004384f000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.hippoecm.repository.RefreshingEventListener$1.run(RefreshingEventListener.java:96) > "ClusterNode-s1720" daemon prio=10 tid=0x00007ff070794800 nid=0x334c in Object.wait() [0x000000004374e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc78> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) > at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) > at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) > at java.lang.Thread.run(Thread.java:619) > "IndexMerger" daemon prio=10 tid=0x00007ff06c05f800 nid=0x7271 in Object.wait() [0x000000004263d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff0813e2858> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "Timer-0" daemon prio=10 tid=0x00007ff06c001000 nid=0x7266 in Object.wait() [0x0000000041594000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.util.TimerThread.mainLoop(Timer.java:509) > - locked <0x00007ff080de49d0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "IndexMerger" daemon prio=10 tid=0x00007ff07794c800 nid=0x7265 in Object.wait() [0x00000000412be000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07f40c0d8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "ObservationManager" daemon prio=10 tid=0x00007ff077076800 nid=0x724d in Object.wait() [0x000000004067f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07eadd8f8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) > at java.lang.Thread.run(Thread.java:619) > "Transient File Reaper" daemon prio=10 tid=0x00007ff07041e800 nid=0x724c in Object.wait() [0x0000000040a39000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) > "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007ff070483000 nid=0x724b in Object.wait() [0x00000000411bd000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.lang.Object.wait(Object.java:485) > at java.util.TimerThread.mainLoop(Timer.java:483) > - locked <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "Low Memory Detector" daemon prio=10 tid=0x00007ff070004000 nid=0x7240 runnable [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread1" daemon prio=10 tid=0x00007ff070001000 nid=0x723f waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread0" daemon prio=10 tid=0x00007ff077aa7800 nid=0x723e waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Signal Dispatcher" daemon prio=10 tid=0x00007ff077aa5800 nid=0x723d waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Finalizer" daemon prio=10 tid=0x00007ff077f29800 nid=0x723a in Object.wait() [0x0000000042138000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e214fe8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159) > "Reference Handler" daemon prio=10 tid=0x00007ff077f22000 nid=0x7239 in Object.wait() [0x0000000040fbb000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) > - locked <0x00007ff07e214fb0> (a java.lang.ref.Reference$Lock) > "main" prio=10 tid=0x0000000040113800 nid=0x722e runnable [0x0000000040836000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836f5d60> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.catalina.core.StandardServer.await(StandardServer.java:389) > at org.apache.catalina.startup.Catalina.await(Catalina.java:647) > at org.apache.catalina.startup.Catalina.start(Catalina.java:607) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) > at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) > "VM Thread" prio=10 tid=0x00007ff077f1b000 nid=0x7237 runnable > "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x722f runnable > "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x7230 runnable > "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121800 nid=0x7231 runnable > "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x7232 runnable > "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x7233 runnable > "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040127000 nid=0x7234 runnable > "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x7235 runnable > "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x7236 runnable > "VM Periodic Task Thread" prio=10 tid=0x00007ff070007000 nid=0x7241 waiting on condition > JNI global references: 1147 > Heap > PSYoungGen total 670528K, used 301659K [0x00007ff128b90000, 0x00007ff161a80000, 0x00007ff17e0e0000) > eden space 592512K, 37% used [0x00007ff128b90000,0x00007ff136605ee8,0x00007ff14ce30000) > from space 78016K, 99% used [0x00007ff158160000,0x00007ff15cd81020,0x00007ff15cd90000) > to space 78784K, 0% used [0x00007ff15cd90000,0x00007ff15cd90000,0x00007ff161a80000) > PSOldGen total 1465344K, used 1096343K [0x00007ff07e0e0000, 0x00007ff0d77e0000, 0x00007ff128b90000) > object space 1465344K, 74% used [0x00007ff07e0e0000,0x00007ff0c0f85ea0,0x00007ff0d77e0000) > PSPermGen total 54976K, used 54410K [0x00007ff078ce0000, 0x00007ff07c290000, 0x00007ff07e0e0000) > object space 54976K, 98% used [0x00007ff078ce0000,0x00007ff07c2028f0,0x00007ff07c290000) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Tue Mar 16 16:20:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Tue Mar 16 16:25:33 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3980) Add option to ping servlet to set a custom maintenance message Message-ID: <5789828.6192.1268752848490.JavaMail.jira@jira.vm.castaserver.com> Add option to ping servlet to set a custom maintenance message -------------------------------------------------------------- Key: HREPTWO-3980 URL: http://issues.onehippo.com/browse/HREPTWO-3980 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Bart van der Schans Assignee: Bart van der Schans Fix For: r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Tue Mar 16 16:37:19 2010 From: svn-logs at hippocms.org (bvdschans) Date: Tue Mar 16 16:42:04 2010 Subject: [HippoRepos-dev] [22147] hippo-ecm: HREPTWO-3980: Add option to ping servlet to set a custom maintenance message Message-ID: <20100316153719.C20A61C020@svn.vm.castaserver.com> Revision: 22147 Author: bvdschans Date: 2010-03-16 16:37:19 +0100 (Tue, 16 Mar 2010) Log Message: ----------- HREPTWO-3980: Add option to ping servlet to set a custom maintenance message Modified Paths: -------------- hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java Modified: hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java =================================================================== --- hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java 2010-03-16 13:58:48 UTC (rev 22146) +++ hippo-ecm/trunk/repository/application/src/main/java/org/hippoecm/repository/PingServlet.java 2010-03-16 15:37:19 UTC (rev 22147) @@ -32,17 +32,24 @@ import javax.servlet.http.HttpSession; /** - * A servlet that can be used to check if the repository is up-and-running. This - * is especially useful for load balancer checks. The check does the following steps: - * - obtain the repository with the connection string - * - obtain the session with the specified username and password - * - try to read the check node - * - try to write to the repository if enabled - * - logout and close session - * On success the servlet prints "Ok" and returns a 200 status, on failure, the error is - * printed and a 500 (internal server error) status is returned. + *

    A servlet that can be used to check if the repository is up-and-running. This + * is especially useful for load balancer checks. The check does the following steps:

    + *
      + *
    • Check for static custom return message, else
      • + *
        + *
      • obtain the repository with the connection string
        • + *
      • obtain the session with the specified username and password
        • + *
      • try to read the check node
        • + *
      • try to write to the repository if enabled
        • + *
      • logout and close jcr session
        • + *
      + *
    • logout and close http session
      • + *
    + *

    On success the servlet prints "Ok" and returns a 200 status, on failure, the error is + * printed and a 500 (internal server error) status is returned.

    + *

    In case the custom message is provided, a service unavailable error (503) is returned

    * - * To enable the servlet add the following to your web.xml + *

    To enable the servlet add the following to your web.xml

    * PingServlet @@ -71,6 +78,11 @@ write-check-node pingcheck + PingServlet @@ -92,6 +104,7 @@ private static final String NODE_PARAM = "check-node"; private static final String WRITE_ENABLE_PARAM = "write-check-enable"; private static final String WRITE_PATH_PARAM = "write-check-path"; + private static final String CUSTOM_MESSAGE_PARAM = "custom-message"; /** Default values */ private static final String DEFAULT_REPOSITORY_ADDRESS = "rmi://localhost:1099/hipporepository"; @@ -106,6 +119,7 @@ private String username; private String password; private String checkNode; + private String customMessage; private String writeTestPath; private boolean writeTestEnabled = false; @@ -122,12 +136,13 @@ checkNode = makePathRelative(getParameter(config, NODE_PARAM, DEFAULT_NODE)); writeTestPath = makePathRelative(getParameter(config, WRITE_PATH_PARAM, DEFAULT_WRITE_PATH)); writeTestEnabled = isTrueOrYes(getParameter(config, WRITE_ENABLE_PARAM, DEFAULT_WRITE_ENABLE)); + customMessage = getParameter(config, CUSTOM_MESSAGE_PARAM, null); } private String getParameter(ServletConfig config, String paramName, String defaultValue) { String initValue = config.getInitParameter(paramName); String contextValue = config.getServletContext().getInitParameter(paramName); - + if (isNotNullAndNotEmpty(initValue)) { return initValue; } else if (isNotNullAndNotEmpty(contextValue)) { @@ -136,12 +151,9 @@ return defaultValue; } } - + private boolean isNotNullAndNotEmpty(String s) { - if (s != null && s.length() != 0) { - return true; - } - return false; + return (s != null && s.length() != 0); } private String makePathRelative(String path) { @@ -152,31 +164,34 @@ } private boolean isTrueOrYes(String s) { - if ("true".equalsIgnoreCase(s) || "yes".equalsIgnoreCase(s)) { - return true; - } - return false; + return ("true".equalsIgnoreCase(s) || "yes".equalsIgnoreCase(s)); } @Override protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { int resultStatus = HttpServletResponse.SC_OK; String resultMessage = "OK - Repository online and accessible."; - if (writeTestEnabled) { - resultMessage = "OK - Repository online, accessible and writable."; - } Exception exception = null; - try { - doRepositoryChecks(); - } catch (PingException e) { - resultStatus = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; - resultMessage = e.getMessage(); - exception = e; - } catch (RuntimeException e) { - resultStatus = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; - resultMessage = "FAILURE - Serious problem with the ping servlet. Might have lost repository access: " - + e.getClass().getName() + ": " + e.getMessage(); - exception = e; + + if (hasCustomMessage()) { + resultMessage = "CUSTOM - " + customMessage; + resultStatus = HttpServletResponse.SC_SERVICE_UNAVAILABLE; + } else { + if (writeTestEnabled) { + resultMessage = "OK - Repository online, accessible and writable."; + } + try { + doRepositoryChecks(); + } catch (PingException e) { + resultStatus = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; + resultMessage = e.getMessage(); + exception = e; + } catch (RuntimeException e) { + resultStatus = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; + resultMessage = "FAILURE - Serious problem with the ping servlet. Might have lost repository access: " + + e.getClass().getName() + ": " + e.getMessage(); + exception = e; + } } res.setContentType("text/plain"); @@ -189,6 +204,10 @@ closeHttpSession(req); } + private boolean hasCustomMessage() { + return (customMessage != null); + } + private void closeHttpSession(HttpServletRequest req) { if (req != null) { // close open session From helpdesk at onehippo.com Tue Mar 16 17:13:48 2010 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Tue Mar 16 17:18:31 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3899) Allow editor:templates to configure the hippostd:date/show.today.button property In-Reply-To: <26645289.3095.1267191710563.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <12488255.6260.1268756028606.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3899?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arthur Bogaart updated HREPTWO-3899: ------------------------------------ Original Estimate: 0 minutes Remaining Estimate: 0 minutes Fix Version/s: (was: r2.13.00) Backlog rank: (was: 10490000000) > Allow editor:templates to configure the hippostd:date/show.today.button property > -------------------------------------------------------------------------------- > > Key: HREPTWO-3899 > URL: http://issues.onehippo.com/browse/HREPTWO-3899 > Project: Hippo Repository 2 > Issue Type: New Feature > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Original Estimate: 0 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.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Tue Mar 16 18:30:13 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Tue Mar 16 18:30:10 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_became_unstable=3A__Hipp?= =?utf-8?q?o_ECM_GA_7=2E2_=C2=BB_Reviewed_action_addon_tests_=23116?= Message-ID: <1396010.81268760613156.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Tue Mar 16 18:30:14 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Tue Mar 16 18:30:14 2010 Subject: [HippoRepos-dev] Hudson build became unstable: Hippo ECM GA 7.2 #116 Message-ID: <21219609.91268760614593.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Wed Mar 17 09:47:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 17 09:52:35 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3978) Deadlock in version storage - VersionManagerImpl In-Reply-To: <28596032.5996.1268746908566.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22313639.6424.1268815668659.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3978?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3978: ------------------------------------ Priority: Blocker (was: Top) > Deadlock in version storage - VersionManagerImpl > ------------------------------------------------ > > Key: HREPTWO-3978 > URL: http://issues.onehippo.com/browse/HREPTWO-3978 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jettro Coenradie > Assignee: Berry van Halderen > Priority: Blocker > Fix For: r2.12.08, r2.13.00 > > > During concurrent cms usage we encountered a deadlock situation. The following output was obtained using a kill -3 on the tomcat server > "TP-Processor5" daemon prio=10 tid=0x00007ff076f43000 nid=0x48a3 waiting for monitor entry [0x000000004354a000] > java.lang.Thread.State: BLOCKED (on object monitor) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:565) > - waiting to lock <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff09b34eb80> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:232) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:161) > at sun.reflect.GeneratedMethodAccessor89.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff09b44a230> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy6.add(Unknown Source) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:263) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:237) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.onOk(CompatibilityWorkflowPlugin.java:200) > at org.hippoecm.frontend.dialog.AbstractDialog.handleSubmit(AbstractDialog.java:526) > at org.hippoecm.frontend.dialog.AbstractDialog$2.onSubmit(AbstractDialog.java:395) > at org.hippoecm.frontend.dialog.AbstractDialog$ButtonWrapper$1.onSubmit(AbstractDialog.java:265) > at org.apache.wicket.ajax.markup.html.form.AjaxButton$1.onSubmit(AjaxButton.java:102) > at org.apache.wicket.ajax.form.AjaxFormSubmitBehavior.onEvent(AjaxFormSubmitBehavior.java:143) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-50" daemon prio=10 tid=0x00007ff068245000 nid=0x4635 in Object.wait() [0x0000000047188000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d94a8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-49" daemon prio=10 tid=0x00007ff068c37000 nid=0x4634 in Object.wait() [0x0000000047087000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d67b0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-48" daemon prio=10 tid=0x00007ff068c35000 nid=0x4633 in Object.wait() [0x0000000046f86000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9850> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-47" daemon prio=10 tid=0x00007ff068ceb800 nid=0x4632 in Object.wait() [0x0000000046e85000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6af8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-46" daemon prio=10 tid=0x00007ff068cea000 nid=0x4631 in Object.wait() [0x0000000046d84000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6eb0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-45" daemon prio=10 tid=0x00007ff068dcc000 nid=0x4630 in Object.wait() [0x0000000046c83000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9c08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-44" daemon prio=10 tid=0x00007ff0683ee000 nid=0x462f in Object.wait() [0x0000000046b82000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9e28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-43" daemon prio=10 tid=0x00007ff0683ec000 nid=0x462e in Object.wait() [0x0000000046a81000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-42" daemon prio=10 tid=0x00007ff068c04800 nid=0x462d in Object.wait() [0x0000000046980000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e04c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-41" daemon prio=10 tid=0x00007ff068ab5800 nid=0x462c in Object.wait() [0x000000004687f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e27f0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-40" daemon prio=10 tid=0x00007ff068ab3800 nid=0x462b in Object.wait() [0x000000004677e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-39" daemon prio=10 tid=0x00007ff068dc9000 nid=0x462a in Object.wait() [0x000000004667d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2b38> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-38" daemon prio=10 tid=0x00007ff0699b2800 nid=0x4629 in Object.wait() [0x000000004657c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2d58> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-37" daemon prio=10 tid=0x00007ff068c38800 nid=0x4628 in Object.wait() [0x000000004647b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0bc0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-36" daemon prio=10 tid=0x00007ff069a98800 nid=0x4627 in Object.wait() [0x000000004637a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e30a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-35" daemon prio=10 tid=0x00007ff0680a7000 nid=0x4626 in Object.wait() [0x0000000046279000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-34" daemon prio=10 tid=0x00007ff068ce8800 nid=0x4625 in Object.wait() [0x0000000046178000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3458> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-33" daemon prio=10 tid=0x00007ff06951e800 nid=0x4624 in Object.wait() [0x0000000046077000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1250> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-32" daemon prio=10 tid=0x00007ff06d6f6000 nid=0x4623 in Object.wait() [0x0000000045f76000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e37d8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-31" daemon prio=10 tid=0x00007ff06d6f4000 nid=0x4622 in Object.wait() [0x0000000045e75000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1608> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-30" daemon prio=10 tid=0x00007ff06c1a9000 nid=0x4621 in Object.wait() [0x0000000045d74000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3b20> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-29" daemon prio=10 tid=0x00007ff06c1a7000 nid=0x4620 in Object.wait() [0x0000000045c73000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374def8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-28" daemon prio=10 tid=0x00007ff06c1a5000 nid=0x461f in Object.wait() [0x0000000045b72000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e240> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-27" daemon prio=10 tid=0x00007ff06c1a3000 nid=0x461e in Object.wait() [0x0000000045a71000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e588> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-26" daemon prio=10 tid=0x00007ff06c1a2800 nid=0x461d in Object.wait() [0x0000000045970000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e940> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-25" daemon prio=10 tid=0x00007ff06c0c0800 nid=0x461c in Object.wait() [0x000000004586f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374eb60> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-24" daemon prio=10 tid=0x00007ff06c0c0000 nid=0x461b in Object.wait() [0x000000004576e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374ee70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-23" daemon prio=10 tid=0x00007ff06d846000 nid=0x461a in Object.wait() [0x000000004566d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f1b8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-22" daemon prio=10 tid=0x00007ff06c3f5800 nid=0x4619 in Object.wait() [0x000000004556c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f500> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-21" daemon prio=10 tid=0x00007ff06c3f3800 nid=0x4618 in Object.wait() [0x000000004546b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e52d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-20" daemon prio=10 tid=0x00007ff06d844800 nid=0x4617 in Object.wait() [0x000000004536a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5618> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-19" daemon prio=10 tid=0x00007ff06d842800 nid=0x4616 in Object.wait() [0x0000000045269000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5960> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-18" daemon prio=10 tid=0x00007ff06d840800 nid=0x4615 in Object.wait() [0x0000000045168000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5d50> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-17" daemon prio=10 tid=0x00007ff06c196800 nid=0x4614 in Object.wait() [0x0000000045067000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-16" daemon prio=10 tid=0x00007ff06c194800 nid=0x4613 in Object.wait() [0x0000000044f66000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1950> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-15" daemon prio=10 tid=0x00007ff06c193000 nid=0x4612 in Object.wait() [0x0000000044e65000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e64c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-14" daemon prio=10 tid=0x00007ff06c191000 nid=0x4611 in Object.wait() [0x0000000044d64000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-13" daemon prio=10 tid=0x00007ff06db01800 nid=0x4610 in Object.wait() [0x0000000044c63000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e81e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-12" daemon prio=10 tid=0x00007ff06daff800 nid=0x460f in Object.wait() [0x0000000044b62000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e85a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-11" daemon prio=10 tid=0x00007ff06dafd800 nid=0x460e in Object.wait() [0x0000000044a61000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e88e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-10" daemon prio=10 tid=0x00007ff06dafc000 nid=0x460d in Object.wait() [0x0000000044960000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8b08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-9" daemon prio=10 tid=0x00007ff06c097000 nid=0x460c in Object.wait() [0x000000004485f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8ef8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-8" daemon prio=10 tid=0x00007ff06c095000 nid=0x460b in Object.wait() [0x000000004475e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6c98> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-7" daemon prio=10 tid=0x00007ff06c093000 nid=0x460a in Object.wait() [0x000000004465d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e9558> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-6" daemon prio=10 tid=0x00007ff06c091000 nid=0x4609 in Object.wait() [0x000000004455c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6d70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-5" daemon prio=10 tid=0x00007ff06c010800 nid=0x4608 in Object.wait() [0x000000004445b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e98a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-4" daemon prio=10 tid=0x00007ff06c00e800 nid=0x4607 in Object.wait() [0x000000004435a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eae28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-3" daemon prio=10 tid=0x00007ff06c015000 nid=0x4606 in Object.wait() [0x0000000044259000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb218> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-2" daemon prio=10 tid=0x00007ff06d7bd000 nid=0x4605 in Object.wait() [0x0000000044158000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb5d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-1" daemon prio=10 tid=0x00007ff06d7bc000 nid=0x4604 in Object.wait() [0x0000000044057000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3e68> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-Acceptor-0" daemon prio=10 tid=0x00007ff06d7b9800 nid=0x4603 runnable [0x0000000043f56000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e2b3660> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007ff06d7af800 nid=0x4602 waiting on condition [0x0000000043e55000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "TP-Monitor" daemon prio=10 tid=0x00007ff06e29c000 nid=0x4601 in Object.wait() [0x0000000043d54000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) > - locked <0x00007ff08372be60> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor4" daemon prio=10 tid=0x00007ff06c293000 nid=0x4600 runnable [0x0000000043c53000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836e14c8> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:307) > at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:661) > at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor3" daemon prio=10 tid=0x00007ff06c0e4000 nid=0x45ff in Object.wait() [0x0000000043b50000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.applyAppender(EventLoggerImpl.java:190) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.logEvent(EventLoggerImpl.java:141) > at sun.reflect.GeneratedMethodAccessor73.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy1.logEvent(Unknown Source) > at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:135) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:143) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor2" daemon prio=10 tid=0x00007ff06c0e8800 nid=0x45fe in Object.wait() [0x0000000043a4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.apache.jackrabbit.core.version.AbstractVersionManager$WriteOperation.save(AbstractVersionManager.java:150) > at org.apache.jackrabbit.core.version.AbstractVersionManager.createVersionHistory(AbstractVersionManager.java:317) > at org.apache.jackrabbit.core.version.VersionManagerImpl$1.run(VersionManagerImpl.java:220) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:567) > - locked <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:499) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy3.obtainEditableInstance(Unknown Source) > at org.hippoecm.frontend.plugins.reviewedactions.FullReviewedActionsWorkflowPlugin$3.execute(FullReviewedActionsWorkflowPlugin.java:137) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) > at org.hippoecm.addon.workflow.MenuAction$1.onClick(MenuAction.java:43) > at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) > at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor1" daemon prio=10 tid=0x00007ff06daa9000 nid=0x45fd in Object.wait() [0x0000000042237000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff0bdd8c778> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.decorating.checked.ItemDecorator.save(ItemDecorator.java:173) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:176) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-8080-Acceptor-0" daemon prio=10 tid=0x00007ff06c0ee000 nid=0x45fc runnable [0x000000004253c000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e28cd70> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x00007ff06c0eb000 nid=0x45fb waiting on condition [0x0000000042e45000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-1099" daemon prio=10 tid=0x00007ff077047800 nid=0x45f7 runnable [0x000000004233a000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff083319458> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "GC Daemon" daemon prio=10 tid=0x00007ff077a11800 nid=0x45f3 in Object.wait() [0x000000004273e000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at sun.misc.GC$Daemon.run(GC.java:100) > - locked <0x00007ff0837e6f90> (a sun.misc.GC$LatencyLock) > "RMI Reaper" prio=10 tid=0x00007ff075853800 nid=0x45f2 in Object.wait() [0x0000000041c4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff0837e71a8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-0" daemon prio=10 tid=0x00007ff077334800 nid=0x45f1 runnable [0x000000004187e000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff08331a5e0> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "HJCRQJS_QuartzSchedulerThread" prio=10 tid=0x00007ff068ce7000 nid=0x45f0 sleeping[0x0000000041b4e000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.quartz.core.QuartzSchedulerThread.run(QuartzSchedulerThread.java:394) > "HJCRQJS_Worker-0" prio=10 tid=0x00007ff068394000 nid=0x45ef in Object.wait() [0x0000000043950000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.quartz.simpl.SimpleThreadPool.getNextRunnable(SimpleThreadPool.java:428) > - locked <0x00007ff082e75448> (a java.lang.Object) > at org.quartz.simpl.SimpleThreadPool.access$000(SimpleThreadPool.java:47) > at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:518) > "RefreshingEventListener" prio=10 tid=0x00007ff068a96000 nid=0x45ee waiting on condition [0x000000004384f000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.hippoecm.repository.RefreshingEventListener$1.run(RefreshingEventListener.java:96) > "ClusterNode-s1720" daemon prio=10 tid=0x00007ff070794800 nid=0x334c in Object.wait() [0x000000004374e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc78> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) > at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) > at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) > at java.lang.Thread.run(Thread.java:619) > "IndexMerger" daemon prio=10 tid=0x00007ff06c05f800 nid=0x7271 in Object.wait() [0x000000004263d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff0813e2858> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "Timer-0" daemon prio=10 tid=0x00007ff06c001000 nid=0x7266 in Object.wait() [0x0000000041594000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.util.TimerThread.mainLoop(Timer.java:509) > - locked <0x00007ff080de49d0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "IndexMerger" daemon prio=10 tid=0x00007ff07794c800 nid=0x7265 in Object.wait() [0x00000000412be000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07f40c0d8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "ObservationManager" daemon prio=10 tid=0x00007ff077076800 nid=0x724d in Object.wait() [0x000000004067f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07eadd8f8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) > at java.lang.Thread.run(Thread.java:619) > "Transient File Reaper" daemon prio=10 tid=0x00007ff07041e800 nid=0x724c in Object.wait() [0x0000000040a39000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) > "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007ff070483000 nid=0x724b in Object.wait() [0x00000000411bd000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.lang.Object.wait(Object.java:485) > at java.util.TimerThread.mainLoop(Timer.java:483) > - locked <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "Low Memory Detector" daemon prio=10 tid=0x00007ff070004000 nid=0x7240 runnable [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread1" daemon prio=10 tid=0x00007ff070001000 nid=0x723f waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread0" daemon prio=10 tid=0x00007ff077aa7800 nid=0x723e waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Signal Dispatcher" daemon prio=10 tid=0x00007ff077aa5800 nid=0x723d waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Finalizer" daemon prio=10 tid=0x00007ff077f29800 nid=0x723a in Object.wait() [0x0000000042138000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e214fe8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159) > "Reference Handler" daemon prio=10 tid=0x00007ff077f22000 nid=0x7239 in Object.wait() [0x0000000040fbb000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) > - locked <0x00007ff07e214fb0> (a java.lang.ref.Reference$Lock) > "main" prio=10 tid=0x0000000040113800 nid=0x722e runnable [0x0000000040836000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836f5d60> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.catalina.core.StandardServer.await(StandardServer.java:389) > at org.apache.catalina.startup.Catalina.await(Catalina.java:647) > at org.apache.catalina.startup.Catalina.start(Catalina.java:607) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) > at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) > "VM Thread" prio=10 tid=0x00007ff077f1b000 nid=0x7237 runnable > "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x722f runnable > "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x7230 runnable > "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121800 nid=0x7231 runnable > "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x7232 runnable > "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x7233 runnable > "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040127000 nid=0x7234 runnable > "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x7235 runnable > "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x7236 runnable > "VM Periodic Task Thread" prio=10 tid=0x00007ff070007000 nid=0x7241 waiting on condition > JNI global references: 1147 > Heap > PSYoungGen total 670528K, used 301659K [0x00007ff128b90000, 0x00007ff161a80000, 0x00007ff17e0e0000) > eden space 592512K, 37% used [0x00007ff128b90000,0x00007ff136605ee8,0x00007ff14ce30000) > from space 78016K, 99% used [0x00007ff158160000,0x00007ff15cd81020,0x00007ff15cd90000) > to space 78784K, 0% used [0x00007ff15cd90000,0x00007ff15cd90000,0x00007ff161a80000) > PSOldGen total 1465344K, used 1096343K [0x00007ff07e0e0000, 0x00007ff0d77e0000, 0x00007ff128b90000) > object space 1465344K, 74% used [0x00007ff07e0e0000,0x00007ff0c0f85ea0,0x00007ff0d77e0000) > PSPermGen total 54976K, used 54410K [0x00007ff078ce0000, 0x00007ff07c290000, 0x00007ff07e0e0000) > object space 54976K, 98% used [0x00007ff078ce0000,0x00007ff07c2028f0,0x00007ff07c290000) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 17 11:02:37 2010 From: svn-logs at hippocms.org (abogaart) Date: Wed Mar 17 11:07:25 2010 Subject: [HippoRepos-dev] [22148] hippo-ecm: HREPTWO-3953: Consolidate CMS plugin structure Message-ID: <20100317100237.4A8791C020@svn.vm.castaserver.com> Revision: 22148 Author: abogaart Date: 2010-03-17 11:02:36 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3953: Consolidate CMS plugin structure - removed YuiObject from YuiDatePickerSettings hierarchy - DateTimeField now populates the YuiDatePickerSettings when a pluginconfig node with name 'datepicker' is found Modified Paths: -------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePickerSettings.java Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java 2010-03-16 15:37:19 UTC (rev 22147) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java 2010-03-17 10:02:36 UTC (rev 22148) @@ -27,8 +27,18 @@ import org.apache.wicket.util.convert.converters.DateConverter; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; import org.joda.time.DateTime; +/** + * Semi-fork of YUI DateTimeField from Wicket extensions. Replaces Wicket extensions YUI behaviors with a {@link YuiDatePicker} + * so it fit's in the Hippo ECM YUI framework. + * + * DatePicker can be configured using a frontend:pluginconfig node with name datepicker. + * + * @see YuiDatePickerSettings + */ public class DateTimeField extends org.apache.wicket.extensions.yui.calendar.DateTimeField { private static final long serialVersionUID = 1L; @@ -43,8 +53,17 @@ for(IBehavior b : dateField.getBehaviors()) { dateField.remove(b); } - YuiDatePickerSettings settings = new YuiDatePickerSettings(config); + + YuiDatePickerSettings settings = new YuiDatePickerSettings(); settings.setDatePattern(getDatePattern()); + + if(config.containsKey("datepicker")) { + try { + PluginConfigMapper.populate(settings, config.getPluginConfig("datepicker")); + } catch (MappingException e) { + throw new RuntimeException(e); + } + } dateField.add(new YuiDatePicker(settings)); } Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePickerSettings.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePickerSettings.java 2010-03-16 15:37:19 UTC (rev 22147) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePickerSettings.java 2010-03-17 10:02:36 UTC (rev 22148) @@ -16,31 +16,49 @@ package org.hippoecm.frontend.plugins.yui.datetime; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.yui.javascript.BooleanSetting; -import org.hippoecm.frontend.plugins.yui.javascript.StringSetting; -import org.hippoecm.frontend.plugins.yui.javascript.YuiObject; -import org.hippoecm.frontend.plugins.yui.javascript.YuiType; +import java.io.Serializable; -public class YuiDatePickerSettings extends YuiObject { +public class YuiDatePickerSettings implements Serializable { private static final long serialVersionUID = 1L; - + @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; - - private final static StringSetting DATE_PATTERN = new StringSetting("datePattern", "d-M-yy"); - private final static BooleanSetting HIDE_ON_SELECT = new BooleanSetting("hideOnSelect", true); - private final static BooleanSetting ALIGN_WITH_ICON = new BooleanSetting("alignWithIcon", true); - private final static BooleanSetting FIRE_CHANGE_EVENT = new BooleanSetting("fireChangeEvent", true); - - protected static final YuiType TYPE = new YuiType(DATE_PATTERN, HIDE_ON_SELECT, ALIGN_WITH_ICON, FIRE_CHANGE_EVENT); - public YuiDatePickerSettings(IPluginConfig config) { - super(TYPE, config); + private String datePattern = "d-M-yy"; + private boolean hideOnSelect = true; + private boolean alignWithIcon = true; + private boolean fireChangeEvent = true; + + public String getDatePattern() { + return datePattern; } - - public void setDatePattern(String pattern) { - DATE_PATTERN.set(pattern, this); + + public void setDatePattern(String datePattern) { + this.datePattern = datePattern; } + public boolean isHideOnSelect() { + return hideOnSelect; + } + + public void setHideOnSelect(boolean hideOnSelect) { + this.hideOnSelect = hideOnSelect; + } + + public boolean isAlignWithIcon() { + return alignWithIcon; + } + + public void setAlignWithIcon(boolean alignWithIcon) { + this.alignWithIcon = alignWithIcon; + } + + public boolean isFireChangeEvent() { + return fireChangeEvent; + } + + public void setFireChangeEvent(boolean fireChangeEvent) { + this.fireChangeEvent = fireChangeEvent; + } + } From helpdesk at onehippo.com Wed Mar 17 11:11:48 2010 From: helpdesk at onehippo.com (JIRA (Jettro Coenradie)) Date: Wed Mar 17 11:16:34 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3981) Suddenly we get thousands of log entries of level ERROR with respect to ObservationManager and intermediary nodes Message-ID: <340877.6597.1268820708482.JavaMail.jira@jira.vm.castaserver.com> Suddenly we get thousands of log entries of level ERROR with respect to ObservationManager and intermediary nodes ----------------------------------------------------------------------------------------------------------------- Key: HREPTWO-3981 URL: http://issues.onehippo.com/browse/HREPTWO-3981 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Reporter: Jettro Coenradie Priority: High We get the following type of errors in very large numbers and very fast. Mar 17 11:05:27 s1720 2010-03-17 11:05:26,969 ERROR [ClusterNode-s1720] org.apache.jackrabbit.core.observation.ObservationDispatcher - Synchronous EventConsumer threw exception. Mar 17 11:05:27 s1720 javax.jcr.RepositoryException: failed to retrieve state of intermediary node: 133ca9cd-44b7-4725-9459-af0cc31c8fe9: 133ca9cd-44b7-4725-9459-af0cc31c8fe9 Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.HierarchyManagerImpl.resolvePath(HierarchyManagerImpl.java:329) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.HierarchyManagerImpl.resolvePropertyPath(HierarchyManagerImpl.java:377) Mar 17 11:05:27 s1720 at org.hippoecm.repository.jackrabbit.HippoHierarchyManager.resolvePropertyPath(HippoHierarchyManager.java:60) Mar 17 11:05:27 s1720 at org.hippoecm.repository.security.HippoAccessManager.getNodeId(HippoAccessManager.java:911) Mar 17 11:05:27 s1720 at org.hippoecm.repository.security.HippoAccessManager.canRead(HippoAccessManager.java:419) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.observation.EventConsumer.canRead(EventConsumer.java:296) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.observation.EventConsumer.consumeEvents(EventConsumer.java:228) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.observation.ObservationDispatcher.dispatchEvents(ObservationDispatcher.java:201) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.state.SharedItemStateManager.externalUpdate(SharedItemStateManager.java:1129) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.RepositoryImpl$WorkspaceInfo.externalUpdate(RepositoryImpl.java:2098) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.cluster.ChangeLogRecord.process(ChangeLogRecord.java:384) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.journal.AbstractJournal.doSync(AbstractJournal.java:213) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) Mar 17 11:05:27 s1720 at java.lang.Thread.run(Thread.java:619) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.state.SessionItemStateManager.getItemState(SessionItemStateManager.java:185) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.ZombieHierarchyManager.getItemState(ZombieHierarchyManager.java:62) Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.HierarchyManagerImpl.resolvePath(HierarchyManagerImpl.java:325) Mar 17 11:05:27 s1720 ... 19 more -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 11:29:48 2010 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Wed Mar 17 11:34:35 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3982) Restyle date picker Message-ID: <10383703.6617.1268821788525.JavaMail.jira@jira.vm.castaserver.com> Restyle date picker ------------------- Key: HREPTWO-3982 URL: http://issues.onehippo.com/browse/HREPTWO-3982 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Arthur Bogaart Assignee: Arthur Bogaart Fix For: r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 14:09:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 17 14:14:35 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3973) Author cannot create new document In-Reply-To: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10754161.6770.1268831388606.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3973?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3973: ------------------------------------ Assignee: Bart van der Schans Fix Version/s: r2.12.08 Priority: Blocker (was: Top) > Author cannot create new document > --------------------------------- > > Key: HREPTWO-3973 > URL: http://issues.onehippo.com/browse/HREPTWO-3973 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: ongoing > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.12.08, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 14:15:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 17 14:20:35 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3973) Author cannot create new document In-Reply-To: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <27422047.6788.1268831748735.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3973?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3973: ------------------------------------ Description: menu item to create a new document is missing. cause: security configuration too strict > Author cannot create new document > --------------------------------- > > Key: HREPTWO-3973 > URL: http://issues.onehippo.com/browse/HREPTWO-3973 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: ongoing > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.12.08, r2.13.00 > > > menu item to create a new document is missing. > cause: security configuration too strict -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 14:19:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 17 14:24:34 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3983) ClassCast exception when editing news document Message-ID: <28304753.6792.1268831988504.JavaMail.jira@jira.vm.castaserver.com> ClassCast exception when editing news document ---------------------------------------------- Key: HREPTWO-3983 URL: http://issues.onehippo.com/browse/HREPTWO-3983 Project: Hippo Repository 2 Issue Type: Bug Reporter: Stephan Westen Assignee: Frank van Lankvelt Fix For: r2.12.08, r2.13.00 java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 17 14:40:31 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 17 14:45:24 2010 Subject: [HippoRepos-dev] [22149] hippo-ecm: HREPTWO-3981: When unable to find a nodeid throw a pathnnotfoundexception so it can be handled gracefully Message-ID: <20100317134031.CF50B1C021@svn.vm.castaserver.com> Revision: 22149 Author: bvdschans Date: 2010-03-17 14:40:31 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3981: When unable to find a nodeid throw a pathnnotfoundexception so it can be handled gracefully Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 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 2010-03-17 10:02:36 UTC (rev 22148) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-17 13:40:31 UTC (rev 22149) @@ -902,25 +902,31 @@ return id; } } catch (RepositoryException e) { - // the org.apache.jackrabbit.core.state.NoSuchItemStateException is wrapped in a RepositoryException - // so if the node is only available in the attic this is expected + // fall thru and try zombie hierMgr if (log.isDebugEnabled()) { - log.debug("Error while looking up node, intentionally ignored: " + npRes.getJCRPath(absPath), e); + log.debug("Error while resolving node id of: " + npRes.getJCRPath(absPath), e); } } - // try zombie parent, probably a property - PropertyId pId = zombieHierMgr.resolvePropertyPath(absPath); - if (pId != null) { - NodeId id = pId.getParentId(); - return id; + try { + // try zombie parent, probably a property + PropertyId pId = zombieHierMgr.resolvePropertyPath(absPath); + if (pId != null) { + NodeId id = pId.getParentId(); + return id; + } + + // not in the normal hierarchy manager try the attic aware as fallback, because it's way slower + NodeId id = zombieHierMgr.resolveNodePath(absPath); + if (id != null) { + return id; + } + } catch (RepositoryException e) { + // fall thru and throw a path not found exception + if (log.isDebugEnabled()) { + log.debug("Error while resolving node id of: " + npRes.getJCRPath(absPath), e); + } } - - // not in the normal hierarchy manager try the attic aware as fallback, because it's way slower - NodeId id = zombieHierMgr.resolveNodePath(absPath); - if (id != null) { - return id; - } throw new PathNotFoundException("Unable to resolve the node id from the path " + npRes.getJCRPath(absPath)); } From svn-logs at hippocms.org Wed Mar 17 14:41:35 2010 From: svn-logs at hippocms.org (bvdschans) Date: Wed Mar 17 14:46:25 2010 Subject: [HippoRepos-dev] [22150] hippo-ecm: HREPTWO-3981: When unable to find a nodeid throw a pathnnotfoundexception so it can be handled gracefully Message-ID: <20100317134135.A455B1C020@svn.vm.castaserver.com> Revision: 22150 Author: bvdschans Date: 2010-03-17 14:41:35 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3981: When unable to find a nodeid throw a pathnnotfoundexception so it can be handled gracefully Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-17 13:40:31 UTC (rev 22149) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/security/HippoAccessManager.java 2010-03-17 13:41:35 UTC (rev 22150) @@ -902,25 +902,31 @@ return id; } } catch (RepositoryException e) { - // the org.apache.jackrabbit.core.state.NoSuchItemStateException is wrapped in a RepositoryException - // so if the node is only available in the attic this is expected + // fall thru and try zombie hierMgr if (log.isDebugEnabled()) { - log.debug("Error while looking up node, intentionally ignored: " + npRes.getJCRPath(absPath), e); + log.debug("Error while resolving node id of: " + npRes.getJCRPath(absPath), e); } } - // try zombie parent, probably a property - PropertyId pId = zombieHierMgr.resolvePropertyPath(absPath); - if (pId != null) { - NodeId id = pId.getParentId(); - return id; + try { + // try zombie parent, probably a property + PropertyId pId = zombieHierMgr.resolvePropertyPath(absPath); + if (pId != null) { + NodeId id = pId.getParentId(); + return id; + } + + // not in the normal hierarchy manager try the attic aware as fallback, because it's way slower + NodeId id = zombieHierMgr.resolveNodePath(absPath); + if (id != null) { + return id; + } + } catch (RepositoryException e) { + // fall thru and throw a path not found exception + if (log.isDebugEnabled()) { + log.debug("Error while resolving node id of: " + npRes.getJCRPath(absPath), e); + } } - - // not in the normal hierarchy manager try the attic aware as fallback, because it's way slower - NodeId id = zombieHierMgr.resolveNodePath(absPath); - if (id != null) { - return id; - } throw new PathNotFoundException("Unable to resolve the node id from the path " + npRes.getJCRPath(absPath)); } From helpdesk at onehippo.com Wed Mar 17 14:44:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 17 14:49:34 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3983) ClassCast exception when editing news document In-Reply-To: <28304753.6792.1268831988504.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <24788739.6820.1268833488659.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3983?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87186#action_87186 ] Frank van Lankvelt commented on HREPTWO-3983: --------------------------------------------- is a result of the security improvements. > ClassCast exception when editing news document > ---------------------------------------------- > > Key: HREPTWO-3983 > URL: http://issues.onehippo.com/browse/HREPTWO-3983 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Frank van Lankvelt > Fix For: r2.12.08, r2.13.00 > > > java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 14:44:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Wed Mar 17 14:49:37 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3983) ClassCast exception when editing news document In-Reply-To: <28304753.6792.1268831988504.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <7742985.6830.1268833488847.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3983?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3983: ------------------------------------ Priority: Top (was: Normal) > ClassCast exception when editing news document > ---------------------------------------------- > > Key: HREPTWO-3983 > URL: http://issues.onehippo.com/browse/HREPTWO-3983 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Frank van Lankvelt > Priority: Top > Fix For: r2.12.08, r2.13.00 > > > java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 14:44:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Wed Mar 17 14:49:42 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3981) Suddenly we get thousands of log entries of level ERROR with respect to ObservationManager and intermediary nodes In-Reply-To: <340877.6597.1268820708482.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <27574966.6833.1268833488915.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3981?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87189#action_87189 ] Bart van der Schans commented on HREPTWO-3981: ---------------------------------------------- Jackrabbit tries to autthorize add node/property events of nodes that have been deleted before the event is sent in a clustered environment. The exception is now gracefully handled by the access manager. > Suddenly we get thousands of log entries of level ERROR with respect to ObservationManager and intermediary nodes > ----------------------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3981 > URL: http://issues.onehippo.com/browse/HREPTWO-3981 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jettro Coenradie > Assignee: Bart van der Schans > Priority: High > Fix For: r2.12.08, r2.13.00 > > > We get the following type of errors in very large numbers and very fast. > Mar 17 11:05:27 s1720 2010-03-17 11:05:26,969 ERROR [ClusterNode-s1720] org.apache.jackrabbit.core.observation.ObservationDispatcher - Synchronous EventConsumer threw exception. > Mar 17 11:05:27 s1720 javax.jcr.RepositoryException: failed to retrieve state of intermediary node: 133ca9cd-44b7-4725-9459-af0cc31c8fe9: 133ca9cd-44b7-4725-9459-af0cc31c8fe9 > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.HierarchyManagerImpl.resolvePath(HierarchyManagerImpl.java:329) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.HierarchyManagerImpl.resolvePropertyPath(HierarchyManagerImpl.java:377) > Mar 17 11:05:27 s1720 at org.hippoecm.repository.jackrabbit.HippoHierarchyManager.resolvePropertyPath(HippoHierarchyManager.java:60) > Mar 17 11:05:27 s1720 at org.hippoecm.repository.security.HippoAccessManager.getNodeId(HippoAccessManager.java:911) > Mar 17 11:05:27 s1720 at org.hippoecm.repository.security.HippoAccessManager.canRead(HippoAccessManager.java:419) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.observation.EventConsumer.canRead(EventConsumer.java:296) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.observation.EventConsumer.consumeEvents(EventConsumer.java:228) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.observation.ObservationDispatcher.dispatchEvents(ObservationDispatcher.java:201) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.state.SharedItemStateManager.externalUpdate(SharedItemStateManager.java:1129) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.RepositoryImpl$WorkspaceInfo.externalUpdate(RepositoryImpl.java:2098) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.cluster.ChangeLogRecord.process(ChangeLogRecord.java:384) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.journal.AbstractJournal.doSync(AbstractJournal.java:213) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) > Mar 17 11:05:27 s1720 at java.lang.Thread.run(Thread.java:619) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.state.SessionItemStateManager.getItemState(SessionItemStateManager.java:185) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.ZombieHierarchyManager.getItemState(ZombieHierarchyManager.java:62) > Mar 17 11:05:27 s1720 at org.apache.jackrabbit.core.HierarchyManagerImpl.resolvePath(HierarchyManagerImpl.java:325) > Mar 17 11:05:27 s1720 ... 19 more -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 17 14:45:07 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 17 14:49:55 2010 Subject: [HippoRepos-dev] [22151] hippo-ecm: HREPTWO-3983: only retrieve string value for string property Message-ID: <20100317134507.7D5521C020@svn.vm.castaserver.com> Revision: 22151 Author: fvlankvelt Date: 2010-03-17 14:45:07 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3983: only retrieve string value for string property Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-17 13:41:35 UTC (rev 22150) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-17 13:45:07 UTC (rev 22151) @@ -122,7 +122,7 @@ addTypeViolations(violations, childModel, typeViolations); } } - } else { + } else if (htmlValidator != null || nonEmpty || escaped) { String value = (String) childModel.getObject(); if (htmlValidator != null) { for (String key : htmlValidator.validateNonEmpty(value)) { From svn-logs at hippocms.org Wed Mar 17 14:48:14 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 17 14:53:02 2010 Subject: [HippoRepos-dev] [22152] hippo-ecm: HREPTWO-3983: only retrieve string value for string property Message-ID: <20100317134814.822FE1C020@svn.vm.castaserver.com> Revision: 22152 Author: fvlankvelt Date: 2010-03-17 14:48:14 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3983: only retrieve string value for string property Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-17 13:45:07 UTC (rev 22151) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/validator/JcrFieldValidator.java 2010-03-17 13:48:14 UTC (rev 22152) @@ -122,7 +122,7 @@ addTypeViolations(violations, childModel, typeViolations); } } - } else { + } else if (htmlValidator != null || nonEmpty || escaped) { String value = (String) childModel.getObject(); if (htmlValidator != null) { for (String key : htmlValidator.validateNonEmpty(value)) { From helpdesk at onehippo.com Wed Mar 17 15:45:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Hoffman)) Date: Wed Mar 17 15:50:36 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3984) Cannot rename folder while keeping URL name the same Message-ID: <4925508.7005.1268837148663.JavaMail.jira@jira.vm.castaserver.com> Cannot rename folder while keeping URL name the same ---------------------------------------------------- Key: HREPTWO-3984 URL: http://issues.onehippo.com/browse/HREPTWO-3984 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.08 Reporter: Jeroen Hoffman In the dialog for renaming a folder, when the 'Name' is changed but the 'URL name' is left unchanged (which is default behaviour if the URL name is different already), the following error message occurs: "Cannot rename document to same name." -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 16:13:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Wed Mar 17 16:18:35 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3985) REGRESSION: xinha autosave fails in development mode Message-ID: <33339909.7047.1268838828604.JavaMail.jira@jira.vm.castaserver.com> REGRESSION: xinha autosave fails in development mode ---------------------------------------------------- Key: HREPTWO-3985 URL: http://issues.onehippo.com/browse/HREPTWO-3985 Project: Hippo Repository 2 Issue Type: Bug Reporter: Frank van Lankvelt Assignee: Arthur Bogaart When running the cms in development mode, the (auto)save functionality of xinha does not work any more. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Wed Mar 17 16:16:08 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 17 16:20:56 2010 Subject: [HippoRepos-dev] [22153] hippo-ecm: HREPTWO-3985: run test in production and development modes Message-ID: <20100317151608.0B05F1C020@svn.vm.castaserver.com> Revision: 22153 Author: fvlankvelt Date: 2010-03-17 16:16:07 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3985: run test in production and development modes Modified Paths: -------------- hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/XinhaTest.java hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerTest.java Modified: hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/XinhaTest.java =================================================================== --- hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/XinhaTest.java 2010-03-17 13:48:14 UTC (rev 22152) +++ hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/XinhaTest.java 2010-03-17 15:16:07 UTC (rev 22153) @@ -32,8 +32,6 @@ import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.DefaultServlet; import org.mortbay.jetty.servlet.FilterHolder; -import org.mortbay.jetty.servlet.HashSessionIdManager; -import org.mortbay.jetty.webapp.WebAppContext; import org.mortbay.thread.QueuedThreadPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerTest.java =================================================================== --- hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerTest.java 2010-03-17 13:48:14 UTC (rev 22152) +++ hippo-ecm/trunk/addon/xinha-test/src/test/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/EditorManagerTest.java 2010-03-17 15:16:07 UTC (rev 22153) @@ -114,14 +114,26 @@ } } + @Test + public void testAutoSaveProduction() throws Exception { + setDeployed(true); + testAutoSave(); + } + + @Test + public void testAutoSaveDevelopment() throws Exception { + setDeployed(false); + testAutoSave(); + } + /** * - open a textarea * - click to edit * - set text * - click link outside text * => text should have been saved + * @throws Exception */ - @Test public void testAutoSave() throws Exception { setUp(Page.class); From svn-logs at hippocms.org Wed Mar 17 17:19:23 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 17 17:24:12 2010 Subject: [HippoRepos-dev] [22154] hippo-ecm/trunk: HREPTWO-16: move junit version into root pom Message-ID: <20100317161923.BBD7E1C020@svn.vm.castaserver.com> Revision: 22154 Author: fvlankvelt Date: 2010-03-17 17:19:23 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-16: move junit version into root pom Modified Paths: -------------- hippo-ecm/trunk/addon/cms/browse/pom.xml hippo-ecm/trunk/addon/cms/dashboard/pom.xml hippo-ecm/trunk/addon/cms/edit/pom.xml hippo-ecm/trunk/addon/eavesdrop/pom.xml hippo-ecm/trunk/addon/editor/test/pom.xml hippo-ecm/trunk/addon/faceteddate/repository/pom.xml hippo-ecm/trunk/addon/gotolink/pom.xml hippo-ecm/trunk/addon/reviewed-action/test/pom.xml hippo-ecm/trunk/addon/sample/test/pom.xml hippo-ecm/trunk/addon/standards/frontend/pom.xml hippo-ecm/trunk/addon/workflow/pom.xml hippo-ecm/trunk/addon/xinha-test/pom.xml hippo-ecm/trunk/addon/yui/pom.xml hippo-ecm/trunk/frontend/plugins/pom.xml hippo-ecm/trunk/frontend/test/pom.xml hippo-ecm/trunk/package/test/pom.xml hippo-ecm/trunk/pom.xml hippo-ecm/trunk/repository/application/pom.xml hippo-ecm/trunk/repository/connector/pom.xml hippo-ecm/trunk/repository/engine/pom.xml hippo-ecm/trunk/repository/test/pom.xml hippo-ecm/trunk/tools/development-content/pom.xml hippo-ecm/trunk/tools/projectexport/pom.xml hippo-ecm/trunk/tools/testutils/pom.xml Modified: hippo-ecm/trunk/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/trunk/addon/cms/browse/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/cms/browse/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -92,7 +92,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/trunk/addon/cms/dashboard/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/cms/dashboard/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -102,7 +102,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/trunk/addon/cms/edit/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/cms/edit/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -104,7 +104,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/trunk/addon/eavesdrop/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/eavesdrop/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -75,7 +75,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/trunk/addon/editor/test/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/editor/test/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -115,9 +115,12 @@ junit junit - 4.4 test + + org.easymock + easymockclassextension + javax.servlet Modified: hippo-ecm/trunk/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/trunk/addon/faceteddate/repository/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/faceteddate/repository/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -49,7 +49,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/trunk/addon/gotolink/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/gotolink/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -53,14 +53,11 @@ junit junit - 4.5 test org.easymock easymockclassextension - 2.4 - test javax.servlet Modified: hippo-ecm/trunk/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/test/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/reviewed-action/test/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -110,7 +110,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/trunk/addon/sample/test/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/sample/test/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -87,7 +87,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/standards/frontend/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -72,7 +72,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/addon/workflow/pom.xml =================================================================== --- hippo-ecm/trunk/addon/workflow/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/workflow/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -89,7 +89,6 @@ junit junit - [4.4,) test Modified: hippo-ecm/trunk/addon/xinha-test/pom.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-test/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/xinha-test/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -73,7 +73,6 @@ junit junit - 4.4 org.apache.geronimo.specs Modified: hippo-ecm/trunk/addon/yui/pom.xml =================================================================== --- hippo-ecm/trunk/addon/yui/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/addon/yui/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -96,7 +96,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/trunk/frontend/plugins/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/frontend/plugins/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -78,7 +78,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/frontend/test/pom.xml =================================================================== --- hippo-ecm/trunk/frontend/test/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/frontend/test/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -71,7 +71,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/package/test/pom.xml =================================================================== --- hippo-ecm/trunk/package/test/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/package/test/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -37,7 +37,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/pom.xml =================================================================== --- hippo-ecm/trunk/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -48,7 +48,7 @@ - 1.1 + 2.4 0.9.2 3.1.4 @@ -831,6 +831,14 @@ selenium-java-client-driver ${selenium.version} + + + org.easymock + easymockclassextension + ${easymock.version} + test + + Modified: hippo-ecm/trunk/repository/application/pom.xml =================================================================== --- hippo-ecm/trunk/repository/application/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/repository/application/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -66,7 +66,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/repository/connector/pom.xml =================================================================== --- hippo-ecm/trunk/repository/connector/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/repository/connector/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -88,7 +88,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/repository/engine/pom.xml =================================================================== --- hippo-ecm/trunk/repository/engine/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/repository/engine/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -118,7 +118,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/repository/test/pom.xml =================================================================== --- hippo-ecm/trunk/repository/test/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/repository/test/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -68,7 +68,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/tools/development-content/pom.xml =================================================================== --- hippo-ecm/trunk/tools/development-content/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/tools/development-content/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -87,7 +87,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/trunk/tools/projectexport/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/tools/projectexport/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -78,7 +78,6 @@ junit junit - 4.4 test Modified: hippo-ecm/trunk/tools/testutils/pom.xml =================================================================== --- hippo-ecm/trunk/tools/testutils/pom.xml 2010-03-17 15:16:07 UTC (rev 22153) +++ hippo-ecm/trunk/tools/testutils/pom.xml 2010-03-17 16:19:23 UTC (rev 22154) @@ -38,7 +38,6 @@ junit junit - 4.4 jfree From svn-logs at hippocms.org Wed Mar 17 17:44:02 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 17 17:48:54 2010 Subject: [HippoRepos-dev] [22155] hippo-ecm/trunk: HREPTWO-3958: implement compare framework in template engine Message-ID: <20100317164402.B01A61C020@svn.vm.castaserver.com> Revision: 22155 Author: fvlankvelt Date: 2010-03-17 17:44:02 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3958: implement compare framework in template engine Modified Paths: -------------- hippo-ecm/trunk/addon/cms/edit/src/test/java/org/hippoecm/frontend/plugins/cms/edit/EditorManagerTest.java hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-article.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-event.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-news.xml hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-overview.xml hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/AbstractCmsEditor.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/DefaultCmsEditor.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/EditorFactory.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/HippostdPublishableEditor.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/ITemplateEngine.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorForm.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ITemplateFactory.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.html hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.html hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TemplateController.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ViewerPlugin.java hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java hippo-ecm/trunk/addon/editor/test/src/test/resources/log4j.xml hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/extension.xml hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IEditor.java hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml Added Paths: ----------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/Comparer.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/ValueComparer.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry.html hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry_compat.html hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItem.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TransparentFragment.java hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.html hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.java hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/EditorFactoryTest.java hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/cmstest.cnd hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml Removed Paths: ------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItemRenderer.java Modified: hippo-ecm/trunk/addon/cms/edit/src/test/java/org/hippoecm/frontend/plugins/cms/edit/EditorManagerTest.java =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/test/java/org/hippoecm/frontend/plugins/cms/edit/EditorManagerTest.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/cms/edit/src/test/java/org/hippoecm/frontend/plugins/cms/edit/EditorManagerTest.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -17,15 +17,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.util.List; import java.util.Map; import javax.jcr.Node; import javax.jcr.RepositoryException; -import javax.jcr.version.Version; import org.apache.wicket.IClusterable; import org.apache.wicket.model.IModel; @@ -35,20 +32,14 @@ import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.ModelReference; import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.Plugin; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugin.config.impl.JcrPluginConfig; import org.hippoecm.frontend.service.IEditor; -import org.hippoecm.frontend.service.IEditorFilter; import org.hippoecm.frontend.service.IEditorManager; import org.hippoecm.frontend.service.IRenderService; import org.hippoecm.frontend.service.ITitleDecorator; -import org.hippoecm.frontend.service.ServiceException; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.repository.HippoStdNodeType; -import org.hippoecm.repository.api.HippoNodeType; -import org.hippoecm.repository.api.HippoSession; -import org.hippoecm.repository.reviewedactions.PublishableDocument; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -59,21 +50,10 @@ private static final long serialVersionUID = 1L; - static final String EDITORS = "editors"; static final String PREVIEWS = "previews"; static final String FILTERS = "filters"; static final String RENDERERS = "editor.render"; - public static class Editor extends RenderPlugin { - private static final long serialVersionUID = 1L; - - public Editor(IPluginContext context, IPluginConfig config) { - super(context, config); - - context.registerService(this, EDITORS); - } - } - public static class Preview extends RenderPlugin implements ITitleDecorator { private static final long serialVersionUID = 1L; @@ -92,51 +72,18 @@ } } - public static class CloseFilter extends Plugin implements IEditorFilter { - private static final long serialVersionUID = 1L; - - boolean closed = false; - - public CloseFilter(IPluginContext context, IPluginConfig config) { - super(context, config); - - IEditor editor = context.getService(config.getString("editor.id"), IEditor.class); - context.registerService(this, context.getReference(editor).getServiceId()); - - context.registerService(this, FILTERS); - } - - public Object preClose() { - closed = true; - return new Object(); - } - - public void postClose(Object object) { - } - } - - protected List getPreviews() { + private List getPreviews() { return context.getServices(PREVIEWS, IRenderService.class); } - protected List getEditors() { - return context.getServices(EDITORS, IRenderService.class); - } - - protected List getCloseFilters() { - return context.getServices(FILTERS, CloseFilter.class); - } - - protected List getRenderers() { + private List getRenderers() { return context.getServices(RENDERERS, IRenderService.class); } - final static String[] content1 = { + final static String[] content = { "/test", "nt:unstructured", "/test/content", "nt:unstructured", - "jcr:mixinTypes", "mix:referenceable" - }; - final static String[] content2 = { + "jcr:mixinTypes", "mix:referenceable", "/test/facetsearch", "hippo:facetsearch", "hippo:docbase", "/test/content", "hippo:queryname", "state", @@ -147,18 +94,15 @@ "plugin.class", EditorManagerPlugin.class.getName(), "wicket.model", "model", "editor.id", "editor.manager", - "cluster.edit.name", "editor", + "cluster.edit.name", "preview", "cluster.preview.name", "preview", + "cluster.compare.name", "preview", "/test/plugin/cluster.edit.options", "frontend:pluginconfig", "wicket.id", RENDERERS, "/test/plugin/cluster.preview.options", "frontend:pluginconfig", "wicket.id", RENDERERS, - "/config/test-app/editor", "frontend:plugincluster", - "frontend:references", "wicket.model", - "frontend:services", "wicket.id", - "/config/test-app/editor/plugin", "frontend:plugin", - "plugin.class", Editor.class.getName(), - "wicket.id", "${wicket.id}", + "/test/plugin/cluster.compare.options", "frontend:pluginconfig", + "wicket.id", RENDERERS, "/config/test-app/preview", "frontend:plugincluster", "frontend:references", "wicket.model", "frontend:references", "editor.id", @@ -167,9 +111,6 @@ "plugin.class", Preview.class.getName(), "wicket.id", "${wicket.id}", "wicket.model", "${wicket.model}", - "/config/test-app/preview/filter", "frontend:plugin", - "plugin.class", CloseFilter.class.getName(), - "editor.id", "${editor.id}" }; final static String[] testdocument = new String[] { @@ -193,10 +134,8 @@ @Before public void setUp() throws Exception { super.setUp(); - build(session, content1); + build(session, content); session.save(); - build(session, content2); - session.save(); modelReference = new ModelReference("model", new JcrNodeModel((Node) null)); modelReference.init(context); @@ -225,85 +164,6 @@ } @Test - public void testReviewedActionsEditing() throws Exception { - createDocument("document"); - - IPluginContext pluginContext = start(config); - modelReference.setModel(new JcrNodeModel("/test/content/document")); - assertEquals(1, getPreviews().size()); - - // simulate workflow step "obtainEditableInstance" - Node unpublished = session.getRootNode().getNode("test/content/document/document"); - Node draft = ((HippoSession) session).copy(unpublished, unpublished.getPath()); - draft.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "draft"); - draft.setProperty(HippoStdNodeType.HIPPOSTD_HOLDER, CREDENTIALS.getString("username")); - session.save(); - home.processEvents(); - assertEquals(1, getEditors().size()); - } - - @Test - public void testEditPublished() throws Exception { - createDocument("document"); - - Node unpublished = session.getRootNode().getNode("test/content/document/document"); - unpublished.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "published"); - session.save(); - - IPluginContext pluginContext = start(config); - modelReference.setModel(new JcrNodeModel("/test/content/document")); - assertEquals(1, getPreviews().size()); - - // simulate workflow step "obtainEditableInstance" - Node draft = ((HippoSession) session).copy(unpublished, unpublished.getPath()); - draft.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "draft"); - draft.setProperty(HippoStdNodeType.HIPPOSTD_HOLDER, CREDENTIALS.getString("username")); - session.save(); - home.processEvents(); - assertEquals(1, getEditors().size()); - - // simulate "commitEditableInstance" - draft.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "unpublished"); - session.save(); - home.processEvents(); - assertEquals(1, getPreviews().size()); - assertEquals(0, getEditors().size()); - } - - @Test - public void testSetMode() throws Exception { - - String[] workflowConfig = { - "/publishable", "hipposys:workflow", - "hipposys:nodetype", "hippostd:publishable", - "hipposys:classname", org.hippoecm.repository.reviewedactions.FullReviewedActionsWorkflowImpl.class.getName(), - "hipposys:display", "publishable workflow", - // "/publishable/hipposys:types", "hipposys:types", // autocreated - "/publishable/hipposys:types/" + PublishableDocument.class.getName(), "hipposys:type", - "hipposys:classname", PublishableDocument.class.getName(), - "hipposys:display", "publisahble document", - "hipposys:nodetype", "hippostd:publishable" - }; - build(session, mount("/hippo:configuration/hippo:workflows/default", workflowConfig)); - Node category = session.getRootNode().getNode("hippo:configuration/hippo:workflows/default"); - category.orderBefore("publishable", category.getNodes().nextNode().getName()); - - createDocument("document"); - - session.save(); - - start(config); - IEditorManager editorMgr = context.getService("editor.manager", IEditorManager.class); - IEditor editor = editorMgr.openEditor(new JcrNodeModel("/test/content/document")); - assertEquals(1, getPreviews().size()); - assertEquals(0, getEditors().size()); - - editor.setMode(IEditor.Mode.EDIT); - assertEquals(0, getPreviews().size()); - assertEquals(1, getEditors().size()); - } - - @Test public void browserFollowsActiveEditor() throws Exception { createDocument("doc1"); createDocument("doc2"); @@ -341,24 +201,6 @@ } @Test - public void invokeCloseFilter() throws Exception { - createDocument("document"); - - IPluginContext pluginContext = start(config); - - // open editor - modelReference.setModel(new JcrNodeModel("/test/content/document")); - assertEquals(1, getCloseFilters().size()); - List filters = getCloseFilters(); - - // close editor - IRenderService renderer = getRenderers().get(0); - IEditor editor = context.getService(context.getReference(renderer).getServiceId(), IEditor.class); - editor.close(); - assertTrue(filters.get(0).closed); - } - - @Test public void previewPhysicalNode() throws Exception { createDocument("document"); session.save(); @@ -417,32 +259,6 @@ } @Test - public void testTemplateType() throws Exception { - Node test = root.getNode("test/content").addNode("template", HippoNodeType.NT_TEMPLATETYPE); - test.addNode(HippoNodeType.HIPPOSYSEDIT_NODETYPE, HippoNodeType.NT_HANDLE); - session.save(); - - IPluginContext pluginContext = start(config); - - // open preview - modelReference.setModel(new JcrNodeModel("/test/content/template")); - assertEquals(1, getPreviews().size()); - assertEquals(0, getEditors().size()); - - // edit type - IEditorManager editorMgr = context.getService("editor.manager", IEditorManager.class); - IEditor editor = editorMgr.getEditor(new JcrNodeModel("/test/content/template")); - editor.setMode(IEditor.Mode.EDIT); - assertEquals(0, getPreviews().size()); - assertEquals(1, getEditors().size()); - - // done editing - editor.setMode(IEditor.Mode.VIEW); - assertEquals(1, getPreviews().size()); - assertEquals(0, getEditors().size()); - } - - @Test public void testTitlePropagation() throws Exception { createDocument("document"); start(config); @@ -457,41 +273,4 @@ assertEquals("document", decorator.getTitle().getObject()); } - @Test - public void testVersionedDocument() throws Exception { - createDocument("document"); - session.save(); - start(config); - - Version version = root.getNode("test/content/document").checkin(); - IEditorManager mgr = context.getService("editor.manager", IEditorManager.class); - try { - mgr.openEditor(new JcrNodeModel(version)); - fail("Could open editor for Version"); - } catch (ServiceException e) { - // ignore, this is OK - } - IEditor editor = mgr.openPreview(new JcrNodeModel(version)); - } - - @Test - public void deleteDocumentClosesEditor() throws Exception { - createDocument("document"); - start(config); - - // open preview - JcrNodeModel model = new JcrNodeModel("/test/content/document"); - IEditorManager editorMgr = context.getService("editor.manager", IEditorManager.class); - IEditor editor = editorMgr.openEditor(model); - assertEquals(model, modelReference.getModel()); - home.detach(); - model.detach(); - - session.getRootNode().getNode("test/content").remove(); - session.save(); - home.processEvents(); - - assertEquals(0, getPreviews().size()); - } - } Modified: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml =================================================================== --- hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-address.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -93,6 +93,7 @@ engine wicket.model + model.compareTo validator.id Modified: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-article.xml =================================================================== --- hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-article.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-article.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -132,6 +132,7 @@ engine wicket.model + model.compareTo validator.id @@ -216,6 +217,9 @@ ${validator.id} + + ${model.compareTo} + @@ -242,6 +246,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -274,6 +281,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} Modified: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-event.xml =================================================================== --- hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-event.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-event.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -147,6 +147,7 @@ engine wicket.model + model.compareTo validator.id @@ -195,6 +196,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -224,6 +228,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -253,6 +260,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -282,6 +292,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -319,6 +332,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} Modified: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-news.xml =================================================================== --- hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-news.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-news.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -149,6 +149,7 @@ engine wicket.model + model.compareTo validator.id @@ -197,6 +198,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -226,6 +230,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -255,6 +262,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -292,6 +302,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -329,6 +342,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} Modified: hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-overview.xml =================================================================== --- hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-overview.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/defaultcontent/repository/src/main/resources/types/defaultcontent-type-overview.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -130,6 +130,7 @@ engine wicket.model + model.compareTo validator.id @@ -175,6 +176,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -204,6 +208,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} @@ -244,6 +251,9 @@ ${wicket.model} + + ${model.compareTo} + ${validator.id} Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/AbstractCmsEditor.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/AbstractCmsEditor.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/AbstractCmsEditor.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -64,7 +64,7 @@ protected String getServiceId() { return getPluginContext().getReference(this).getServiceId(); } - + void dispose() { ((ServiceContext) getPluginContext()).stop(); } @@ -131,6 +131,7 @@ private IClusterControl cluster; private EditorWrapper renderer; private ModelReference modelService; + private ModelReference baseService; private IFocusListener focusListener; private String editorId; private String wicketId; @@ -202,13 +203,13 @@ } return filterContexts; } - + protected void postClose(Map contexts) { for (Map.Entry entry : contexts.entrySet()) { entry.getKey().postClose(entry.getValue()); } } - + protected IPluginContext getPluginContext() { return context; } @@ -217,21 +218,29 @@ return config; } - protected IModel getEditorModel() { + protected IModel getEditorModel() throws EditorException { return model; } + protected IModel getBaseModel() throws EditorException { + throw new EditorException("Compare not supported"); + } + protected void start() throws EditorException { String clusterName; IPluginConfig parameters; switch (mode) { case EDIT: - clusterName = config.getString("cluster.edit.name"); + clusterName = config.getString("cluster.edit.name", "cms-editor"); parameters = config.getPluginConfig("cluster.edit.options"); break; + case COMPARE: + clusterName = config.getString("cluster.compare.name", "cms-compare"); + parameters = config.getPluginConfig("cluster.compare.options"); + break; case VIEW: default: - clusterName = config.getString("cluster.preview.name"); + clusterName = config.getString("cluster.preview.name", "cms-preview"); parameters = config.getPluginConfig("cluster.preview.options"); break; } @@ -252,6 +261,12 @@ modelService = new ModelReference(modelId, getEditorModel()); modelService.init(context); + if (mode == Mode.COMPARE) { + String baseId = decorated.getString("model.compareTo"); + baseService = new ModelReference(baseId, getBaseModel()); + baseService.init(context); + } + String editorId = decorated.getString("editor.id"); context.registerService(this, editorId); context.registerService(editorContext.getEditorManager(), editorId); @@ -296,6 +311,11 @@ context.unregisterService(editorContext.getEditorManager(), editorId); context.unregisterService(this, editorId); + if (baseService != null) { + baseService.destroy(); + baseService = null; + } + modelService.destroy(); cluster = null; Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/DefaultCmsEditor.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/DefaultCmsEditor.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/DefaultCmsEditor.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -52,7 +52,7 @@ } @Override - protected IModel getEditorModel() { + protected IModel getEditorModel() throws EditorException { IModel model = super.getEditorModel(); try { Node node = model.getObject(); @@ -68,8 +68,7 @@ return model; } } catch (RepositoryException ex) { - log.warn("cannot obtain proper editable document from handle", ex); - return null; + throw new EditorException("cannot obtain proper editable document from handle", ex); } } Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/EditorFactory.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/EditorFactory.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/EditorFactory.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -72,4 +72,5 @@ editor.start(); return editor; } + } Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/HippostdPublishableEditor.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/HippostdPublishableEditor.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/HippostdPublishableEditor.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -65,6 +65,13 @@ private static final Logger log = LoggerFactory.getLogger(HippostdPublishableEditor.class); + static class WorkflowState { + IModel draft; + IModel unpublished; + IModel published; + boolean isHolder; + } + private IModel editorModel; HippostdPublishableEditor(IEditorContext manager, IPluginContext context, IPluginConfig config, IModel model) @@ -73,17 +80,37 @@ } @Override - protected IModel getEditorModel() { + protected IModel getEditorModel() throws EditorException { + WorkflowState state = getWorkflowState(super.getEditorModel()); switch (getMode()) { case EDIT: - return getDraftModel(super.getEditorModel()); + if (state.draft == null || !state.isHolder) { + throw new EditorException("No draft present for editing"); + } + return state.draft; case VIEW: + if (state.unpublished != null) { + return state.unpublished; + } + return state.published; default: - return getPreviewModel(super.getEditorModel()); + if (state.unpublished == null || state.published == null) { + throw new EditorException("Can only compare when both unpublished and published are present"); + } + return state.unpublished; } } @Override + protected IModel getBaseModel() throws EditorException { + if (getMode() != Mode.COMPARE) { + return super.getBaseModel(); + } + WorkflowState state = getWorkflowState(super.getEditorModel()); + return state.published; + } + + @Override public void setMode(Mode mode) throws EditorException { IModel editorModel = getEditorModel(); if (mode != getMode() && editorModel != null) { @@ -98,15 +125,17 @@ postClose(contexts); try { - switch (mode) { - case EDIT: - ((EditableWorkflow) workflow).obtainEditableInstance(); - break; - case VIEW: - ((EditableWorkflow) workflow).commitEditableInstance(); - break; + if (mode == Mode.EDIT || getMode() == Mode.EDIT) { + switch (mode) { + case EDIT: + ((EditableWorkflow) workflow).obtainEditableInstance(); + break; + case VIEW: + case COMPARE: + ((EditableWorkflow) workflow).commitEditableInstance(); + break; + } } - super.setMode(mode); } finally { @@ -169,87 +198,57 @@ } static Mode getMode(IModel nodeModel) throws EditorException { + WorkflowState wfState = getWorkflowState(nodeModel); + // select draft if it exists - IModel draftDocument = getDraftModel(nodeModel); - if (draftDocument != null) { + if (wfState.draft != null && wfState.isHolder) { return Mode.EDIT; } // show preview - IModel previewDocument = getPreviewModel(nodeModel); - if (previewDocument != null) { - return Mode.VIEW; + if (wfState.unpublished == null && wfState.published == null) { + throw new EditorException("unable to find draft or unpublished variants"); } - throw new EditorException("unable to find draft or unpublished variants"); + if (wfState.unpublished != null && wfState.published != null) { + return Mode.COMPARE; + } + return Mode.VIEW; } - static IModel getPreviewModel(IModel handle) { + static WorkflowState getWorkflowState(IModel handle) throws EditorException { + WorkflowState wfState = new WorkflowState(); try { + String user = ((UserSession) Session.get()).getJcrSession().getUserID(); Node handleNode = handle.getObject(); - Node nostate = null; - Node published = null; - Node draft = null; - if (handleNode.isNodeType(HippoNodeType.NT_HANDLE)) { - for (NodeIterator iter = handleNode.getNodes(); iter.hasNext();) { - Node child = iter.nextNode(); - if (child.getName().equals(handleNode.getName())) { - if (child.hasProperty(HippoStdNodeType.HIPPOSTD_STATE)) { - String state = child.getProperty(HippoStdNodeType.HIPPOSTD_STATE).getString(); - if (state.equals(HippoStdNodeType.UNPUBLISHED)) { - return new JcrNodeModel(child); - } else if (state.equals(HippoStdNodeType.PUBLISHED)) { - published = child; - } else if (state.equals(HippoStdNodeType.DRAFT)) { - draft = child; + if (!handleNode.isNodeType(HippoNodeType.NT_HANDLE)) { + throw new EditorException("Invalid node, not of type " + HippoNodeType.NT_HANDLE); + } + for (NodeIterator iter = handleNode.getNodes(); iter.hasNext();) { + Node child = iter.nextNode(); + if (child.getName().equals(handleNode.getName())) { + if (child.hasProperty(HippoStdNodeType.HIPPOSTD_STATE)) { + String state = child.getProperty(HippoStdNodeType.HIPPOSTD_STATE).getString(); + if (state.equals(HippoStdNodeType.UNPUBLISHED)) { + wfState.unpublished = new JcrNodeModel(child); + } else if (state.equals(HippoStdNodeType.PUBLISHED)) { + wfState.published = new JcrNodeModel(child); + } else if (state.equals(HippoStdNodeType.DRAFT)) { + wfState.draft = new JcrNodeModel(child); + if (!child.hasProperty(HippoStdNodeType.HIPPOSTD_HOLDER) + || child.getProperty(HippoStdNodeType.HIPPOSTD_HOLDER).getString().equals(user)) { + wfState.isHolder = true; } - } else { - nostate = child; } } } - if (published != null) { - return new JcrNodeModel(published); - } else if (draft != null) { - return new JcrNodeModel(draft); - } else if (nostate != null) { - return new JcrNodeModel(nostate); - } - } else { - return handle; } } catch (RepositoryException ex) { - log.error(ex.getMessage()); + throw new EditorException("Could not determine workflow state", ex); } - return null; + return wfState; } - static IModel getDraftModel(IModel handle) { - String user = ((UserSession) Session.get()).getJcrSession().getUserID(); - try { - Node handleNode = handle.getObject(); - if (handleNode.isNodeType(HippoNodeType.NT_HANDLE)) { - for (NodeIterator iter = handleNode.getNodes(); iter.hasNext();) { - Node child = iter.nextNode(); - if (child.getName().equals(handleNode.getName())) { - if (child.hasProperty(HippoStdNodeType.HIPPOSTD_STATE) - && child.getProperty(HippoStdNodeType.HIPPOSTD_STATE).getString().equals( - HippoStdNodeType.DRAFT) - && (!child.hasProperty(HippoStdNodeType.HIPPOSTD_HOLDER) || child.getProperty( - HippoStdNodeType.HIPPOSTD_HOLDER).getString().equals(user))) { - return new JcrNodeModel(child); - } - } - } - } else { - log.warn("Editor model is not a handle"); - } - } catch (RepositoryException ex) { - log.error(ex.getMessage()); - } - return null; - } - @Override public void detach() { if (editorModel != null) { Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/ITemplateEngine.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/ITemplateEngine.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/ITemplateEngine.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -20,25 +20,33 @@ import org.apache.wicket.IClusterable; import org.apache.wicket.model.IModel; import org.hippoecm.frontend.plugin.config.IClusterConfig; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.types.ITypeDescriptor; public interface ITemplateEngine extends IClusterable { final static String SVN_ID = "$Id$"; + /** + * The configuration key to use when locating the template engine service. + */ String ENGINE = "engine"; String TEMPLATE = "template"; String MODE = "mode"; + @Deprecated String EDIT_MODE = "edit"; ITypeDescriptor getType(String type) throws TemplateEngineException; ITypeDescriptor getType(IModel model) throws TemplateEngineException; + @Deprecated IClusterConfig getTemplate(ITypeDescriptor type, String mode) throws TemplateEngineException; + IClusterConfig getTemplate(ITypeDescriptor type, IEditor.Mode mode) throws TemplateEngineException; + IModel getPrototype(ITypeDescriptor type) throws TemplateEngineException; List getEditableTypes(); Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/Comparer.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/Comparer.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/Comparer.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,41 @@ +/* + * Copyright 2010 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.editor.compare; + +import java.io.Serializable; + +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.types.ITypeDescriptor; + +/** + * Compares two models for equality based on their content. + */ +public abstract class Comparer implements Serializable { + private static final long serialVersionUID = 1L; + + ITypeDescriptor type; + + protected Comparer(ITypeDescriptor type) { + this.type = type; + } + + protected ITypeDescriptor getType() { + return type; + } + + public abstract boolean areEqual(IModel base, IModel target); + +} Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/Comparer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,37 @@ +/* + * Copyright 2010 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.editor.compare; + +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.types.ITypeDescriptor; + +public class NodeComparer extends Comparer { + private static final long serialVersionUID = 1L; + + public NodeComparer(ITypeDescriptor type) { + super(type); + if (!type.isNode()) { + throw new RuntimeException("type does not correpond to a node type"); + } + } + + @Override + public boolean areEqual(IModel base, IModel target) { + // TODO: implement + return false; + } + +} Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/ValueComparer.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/ValueComparer.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/ValueComparer.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,45 @@ +/* + * Copyright 2010 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.editor.compare; + +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.types.ITypeDescriptor; + +public class ValueComparer extends Comparer { + private static final long serialVersionUID = 9007990171845097749L; + + public ValueComparer(ITypeDescriptor type) { + super(type); + if (type.isNode()) { + throw new RuntimeException("type does not correpond to a value type"); + } + } + + @Override + public boolean areEqual(IModel base, IModel target) { + Object oldValue = base.getObject(); + Object newValue = target.getObject(); + if (oldValue != null && newValue != null) { + if (!oldValue.equals(newValue)) { + return false; + } + } else if (oldValue != newValue) { + return false; + } + return true; + } + +} Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/compare/ValueComparer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorForm.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorForm.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/editor/EditorForm.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -33,6 +33,7 @@ import org.hippoecm.frontend.plugin.config.IClusterConfig; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.IRenderService; import org.hippoecm.frontend.service.ServiceTracker; import org.hippoecm.frontend.service.render.RenderService; @@ -160,11 +161,11 @@ try { ITypeDescriptor type = engine.getType(model); - IClusterConfig template = engine.getTemplate(type, ITemplateEngine.EDIT_MODE); + IClusterConfig template = engine.getTemplate(type, IEditor.Mode.EDIT); IPluginConfig parameters = new JavaPluginConfig(config.getPluginConfig("cluster.options")); parameters.put(RenderService.WICKET_ID, engineId + ".wicket.root"); parameters.put(ITemplateEngine.ENGINE, engineId); - parameters.put(ITemplateEngine.MODE, ITemplateEngine.EDIT_MODE); + parameters.put(ITemplateEngine.MODE, IEditor.Mode.EDIT.toString()); cluster = context.newCluster(template, parameters); Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/impl/TemplateEngine.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -31,6 +31,7 @@ import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.ocm.StoreException; import org.hippoecm.frontend.plugin.config.IClusterConfig; +import org.hippoecm.frontend.service.IEditor.Mode; import org.hippoecm.frontend.types.ITypeDescriptor; import org.hippoecm.frontend.types.ITypeLocator; import org.hippoecm.repository.api.HippoNodeType; @@ -111,6 +112,10 @@ } } + public IClusterConfig getTemplate(ITypeDescriptor type, Mode mode) throws TemplateEngineException { + return getTemplate(type, mode.toString()); + } + public IModel getPrototype(ITypeDescriptor type) { return prototypeStore.getPrototype(type.getName(), false); } @@ -129,9 +134,7 @@ if (prototypeStore instanceof IDetachable) { ((IDetachable) prototypeStore).detach(); } - if (typeLocator instanceof IDetachable) { - ((IDetachable) typeLocator).detach(); - } + typeLocator.detach(); editableTypes = null; } Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/TextTemplatePlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -17,9 +17,9 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import org.hippoecm.frontend.editor.ITemplateEngine; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.widgets.TextAreaWidget; import org.slf4j.Logger; @@ -37,8 +37,8 @@ super(context, config); IModel valueModel = getModel(); - String mode = config.getString("mode", "view"); - if (ITemplateEngine.EDIT_MODE.equals(mode)) { + IEditor.Mode mode = IEditor.Mode.fromString(config.getString("mode", "view")); + if (IEditor.Mode.EDIT == mode) { IModel encodedStringModel = new EncodedStringModel(valueModel); TextAreaWidget widget = new TextAreaWidget("value", encodedStringModel); if (config.getString("rows") != null) { Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/ValueTemplatePlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -17,11 +17,11 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import org.hippoecm.frontend.editor.ITemplateEngine; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; import org.hippoecm.frontend.model.properties.StringConverter; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.widgets.TextFieldWidget; import org.slf4j.Logger; @@ -38,9 +38,9 @@ public ValueTemplatePlugin(IPluginContext context, IPluginConfig config) { super(context, config); - String mode = config.getString("mode", "view"); StringConverter stringModel = new StringConverter((JcrPropertyValueModel) getModel()); - if (ITemplateEngine.EDIT_MODE.equals(mode)) { + IEditor.Mode mode = IEditor.Mode.fromString(config.getString("mode", "view")); + if (IEditor.Mode.EDIT == mode) { IModel encodedStringModel = new EncodedStringModel(stringModel); TextFieldWidget widget = new TextFieldWidget("value", encodedStringModel); if (config.getString("size") != null) { Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -29,7 +29,11 @@ import org.apache.wicket.model.StringResourceModel; import org.hippoecm.frontend.editor.ITemplateEngine; import org.hippoecm.frontend.editor.TemplateEngineException; +import org.hippoecm.frontend.editor.compare.Comparer; +import org.hippoecm.frontend.editor.compare.NodeComparer; +import org.hippoecm.frontend.editor.compare.ValueComparer; import org.hippoecm.frontend.model.AbstractProvider; +import org.hippoecm.frontend.model.IModelReference; import org.hippoecm.frontend.model.event.IObservable; import org.hippoecm.frontend.model.event.IObserver; import org.hippoecm.frontend.model.event.Observer; @@ -39,6 +43,7 @@ import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; import org.hippoecm.frontend.plugins.standards.list.resolvers.CssClassAppender; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.IRenderService; import org.hippoecm.frontend.service.render.ListViewPlugin; import org.hippoecm.frontend.service.render.RenderService; @@ -89,16 +94,21 @@ public static final String FIELD = "field"; public static final String TYPE = "type"; - protected String mode; + protected IEditor.Mode mode; + private boolean restartTemplates = true; + + // view and edit modes protected AbstractProvider provider; - private FieldPluginHelper helper; - private TemplateController controller; - + private TemplateController templateController; private boolean managedValidation = false; private Map listeners = new HashMap(); - private boolean restartTemplates = true; + // compare mode + private IModel

    compareTo; + protected AbstractProvider oldProvider; + protected AbstractProvider newProvider; + private ComparingController comparingController; protected AbstractFieldPlugin(IPluginContext context, IPluginConfig config) { super(context, config); @@ -117,58 +127,75 @@ }, IObserver.class.getName()); } - controller = new TemplateController(context, config, helper.getValidationModel(), this); + mode = IEditor.Mode.fromString(config.getString(ITemplateEngine.MODE, "view")); + if (IEditor.Mode.COMPARE == mode) { + IModelReference

    compareToModelRef = context.getService(config.getString("model.compareTo"), + IModelReference.class); + if (compareToModelRef != null) { + // TODO: add observer + compareTo = compareToModelRef.getModel(); + } - mode = config.getString(ITemplateEngine.MODE); - if (mode == null) { - log.error("No edit mode specified"); - } + Comparer comparer; + ITypeDescriptor type = helper.getField().getTypeDescriptor(); + if (type.isNode()) { + comparer = new NodeComparer(type); + } else { + comparer = new ValueComparer(type); + } - provider = getProvider(); + comparingController = new ComparingController(context, config, this, comparer, getItemId()); - IFieldDescriptor field = helper.getField(); - if (field != null && !doesTemplateSupportValidation()) { - final ValidationFilter holder = new ValidationFilter() { - private static final long serialVersionUID = 1L; + } else { + templateController = new TemplateController(context, config, helper.getValidationModel(), this, + getItemId()); - @Override - public void onValidation(IValidationResult validation) { - boolean valid = true; - if (!validation.isValid()) { - IFieldDescriptor field = getFieldHelper().getField(); - for (Violation violation : validation.getViolations()) { - Set paths = violation.getDependentPaths(); - for (ModelPath path : paths) { - if (path.getElements().length > 0) { - ModelPathElement first = path.getElements()[0]; - if (first.getField().equals(field)) { - valid = false; + provider = getProvider(getModel()); + + IFieldDescriptor field = helper.getField(); + if (field != null && !doesTemplateSupportValidation()) { + final ValidationFilter holder = new ValidationFilter() { + private static final long serialVersionUID = 1L; + + @Override + public void onValidation(IValidationResult validation) { + boolean valid = true; + if (!validation.isValid()) { + IFieldDescriptor field = getFieldHelper().getField(); + for (Violation violation : validation.getViolations()) { + Set paths = violation.getDependentPaths(); + for (ModelPath path : paths) { + if (path.getElements().length > 0) { + ModelPathElement first = path.getElements()[0]; + if (first.getField().equals(field)) { + valid = false; + } + break; } + } + if (!valid) { break; } } - if (!valid) { - break; - } } + if (valid != isValid()) { + redraw(); + setValid(valid); + } } - if (valid != isValid()) { - redraw(); - setValid(valid); - } + + }; + IModel validationModel = helper.getValidationModel(); + if (validationModel != null && validationModel.getObject() != null) { + holder.setValid(validationModel.getObject().isValid()); } + addValidationFilter(this, holder); - }; - IModel validationModel = helper.getValidationModel(); - if (validationModel != null && validationModel.getObject() != null) { - holder.setValid(validationModel.getObject().isValid()); + managedValidation = true; + if (!field.isMultiple()) { + add(new CssClassAppender(holder)); + } } - addValidationFilter(this, holder); - - managedValidation = true; - if (!field.isMultiple()) { - add(new CssClassAppender(holder)); - } } } @@ -184,7 +211,12 @@ provider.detach(); } helper.detach(); - controller.detach(); + if (templateController != null) { + templateController.detach(); + } + if (comparingController != null) { + comparingController.detach(); + } super.onDetach(); } @@ -193,40 +225,49 @@ listener.setValid(true); } } - + @Override protected void redraw() { super.redraw(); if (!restartTemplates) { restartTemplates = true; - controller.stop(); + if (templateController != null) { + templateController.stop(); + } else { + comparingController.stop(); + } } } @Override protected void onBeforeRender() { if (restartTemplates) { - provider = getProvider(); - if (provider != null) { - setVisible(true); - controller.start(provider); - } else { - setVisible(false); + if (templateController != null) { + provider = getProvider(getModel()); + if (provider != null) { + setVisible(true); + templateController.start(provider); + } else { + setVisible(false); + } + } else if (comparingController != null) { + oldProvider = getProvider(compareTo); + newProvider = getProvider(getModel()); + comparingController.start(oldProvider, newProvider, helper.getField().getTypeDescriptor()); } restartTemplates = false; } super.onBeforeRender(); } - private AbstractProvider getProvider() { + private AbstractProvider getProvider(IModel

    model) { IFieldDescriptor field = helper.getField(); if (field != null) { ITemplateEngine engine = getTemplateEngine(); if (engine != null) { - IModel

    model = getModel(); ITypeDescriptor subType = field.getTypeDescriptor(); AbstractProvider provider = newProvider(field, subType, model); - if (ITemplateEngine.EDIT_MODE.equals(mode) && provider.size() == 0) { + if (IEditor.Mode.EDIT == mode && provider.size() == 0) { provider.addNew(); } return provider; @@ -251,13 +292,12 @@ protected boolean canAddItem() { IFieldDescriptor field = getFieldHelper().getField(); - return ITemplateEngine.EDIT_MODE.equals(mode) && (field != null) - && (field.isMultiple() || provider.size() == 0); + return IEditor.Mode.EDIT == mode && (field != null) && (field.isMultiple() || provider.size() == 0); } protected boolean canRemoveItem() { IFieldDescriptor field = helper.getField(); - if (!ITemplateEngine.EDIT_MODE.equals(mode) || (field == null)) + if (IEditor.Mode.EDIT != mode || (field == null)) return false; if (!field.isMultiple()) { return false; @@ -270,7 +310,7 @@ protected boolean canReorderItems() { IFieldDescriptor field = helper.getField(); - if (!ITemplateEngine.EDIT_MODE.equals(mode) || field == null || !field.isMultiple() || !field.isOrdered()) { + if (IEditor.Mode.EDIT != mode || field == null || !field.isMultiple() || !field.isOrdered()) { return false; } return true; @@ -298,56 +338,76 @@ } @Override - protected void onAddRenderService(final org.apache.wicket.markup.repeater.Item item, + protected final void onAddRenderService(final org.apache.wicket.markup.repeater.Item item, IRenderService renderer) { super.onAddRenderService(item, renderer); - final FieldItemRenderer itemRenderer = getController().findItemRenderer(renderer); - if (managedValidation && getFieldHelper().getField().isMultiple()) { - item.setOutputMarkupId(true); - ValidationFilter listener = new ValidationFilter() { - private static final long serialVersionUID = 1L; + switch (mode) { + case EDIT: + final FieldItem itemRenderer = templateController.getFieldItem(renderer); + if (managedValidation && getFieldHelper().getField().isMultiple()) { + item.setOutputMarkupId(true); + ValidationFilter listener = new ValidationFilter() { + private static final long serialVersionUID = 1L; - @Override - public void onValidation(IValidationResult result) { - boolean valid = itemRenderer.isValid(); - if (valid != this.isValid()) { - AjaxRequestTarget target = AjaxRequestTarget.get(); - if (target != null) { - target.addComponent(item); + @Override + public void onValidation(IValidationResult result) { + boolean valid = itemRenderer.isValid(); + if (valid != this.isValid()) { + AjaxRequestTarget target = AjaxRequestTarget.get(); + if (target != null) { + target.addComponent(item); + } + setValid(valid); } - setValid(valid); } - } - }; - listener.setValid(itemRenderer.isValid()); - addValidationFilter(item, listener); - item.add(new CssClassAppender(listener)); + }; + listener.setValid(itemRenderer.isValid()); + addValidationFilter(item, listener); + item.add(new CssClassAppender(listener)); + } + C model = (C) itemRenderer.getModel(); + populateEditItem(item, model); + break; + case COMPARE: + populateCompareItem(item); + break; + case VIEW: + populateViewItem(item); + break; } } @Override - protected void onRemoveRenderService(org.apache.wicket.markup.repeater.Item item, + protected final void onRemoveRenderService(org.apache.wicket.markup.repeater.Item item, IRenderService renderer) { removeValidationFilter(item); super.onRemoveRenderService(item, renderer); } + protected void populateEditItem(org.apache.wicket.markup.repeater.Item item, C model) { + } + + protected void populateViewItem(org.apache.wicket.markup.repeater.Item item) { + } + + protected void populateCompareItem(org.apache.wicket.markup.repeater.Item item) { + } + protected FieldPluginHelper getFieldHelper() { return helper; } protected IModel getCaptionModel() { IFieldDescriptor field = getFieldHelper().getField(); - String caption = getPluginConfig().getString("caption", "unknown"); + String caption = getPluginConfig().getString("caption"); String captionKey = field != null ? field.getName() : caption; + if (caption == null && field != null && field.getName().length() >= 1) { + caption = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); + } return new StringResourceModel(captionKey, this, null, caption); } - protected TemplateController getController() { - return controller; - } - protected ITemplateEngine getTemplateEngine() { return getPluginContext() .getService(getPluginConfig().getString(ITemplateEngine.ENGINE), ITemplateEngine.class); @@ -364,15 +424,27 @@ } } - public IClusterControl getTemplate(C model) throws TemplateEngineException { + public IClusterControl newTemplate(String id, IEditor.Mode mode) throws TemplateEngineException { + if (mode == null) { + mode = this.mode; + } ITemplateEngine engine = getTemplateEngine(); IFieldDescriptor field = helper.getField(); - IClusterConfig template = engine.getTemplate(field.getTypeDescriptor(), mode); + IClusterConfig template; + try { + template = engine.getTemplate(field.getTypeDescriptor(), mode); + } catch (TemplateEngineException ex) { + if (IEditor.Mode.COMPARE == mode) { + template = engine.getTemplate(field.getTypeDescriptor(), IEditor.Mode.VIEW); + } else { + throw ex; + } + } IPluginConfig parameters = new JavaPluginConfig(getPluginConfig().getPluginConfig("cluster.options")); parameters.put(ITemplateEngine.ENGINE, getPluginConfig().getString(ITemplateEngine.ENGINE)); - parameters.put(RenderService.WICKET_ID, getItemId()); - parameters.put(ITemplateEngine.MODE, mode); + parameters.put(RenderService.WICKET_ID, id); + parameters.put(ITemplateEngine.MODE, mode.toString()); return getPluginContext().newCluster(template, parameters); } Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry.html =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry.html (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry.html 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,20 @@ + + + +

    + + \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry_compat.html =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry_compat.html (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry_compat.html 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,21 @@ + + + +
    +
    +     + \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController$ItemEntry_compat.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,247 @@ +/* + * Copyright 2010 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.editor.plugins.field; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import org.apache.wicket.model.IDetachable; +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.editor.TemplateEngineException; +import org.hippoecm.frontend.editor.compare.Comparer; +import org.hippoecm.frontend.model.AbstractProvider; +import org.hippoecm.frontend.model.ModelReference; +import org.hippoecm.frontend.plugin.IClusterControl; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; +import org.hippoecm.frontend.service.IEditor; +import org.hippoecm.frontend.service.IRenderService; +import org.hippoecm.frontend.service.ServiceContext; +import org.hippoecm.frontend.service.render.RenderService; +import org.hippoecm.frontend.types.ITypeDescriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ComparingController implements IDetachable { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + static final Logger log = LoggerFactory.getLogger(TemplateController.class); + + class ItemEntry extends RenderService { + private static final long serialVersionUID = 1L; + + C oldModel; + FieldItem oldFir; + + C newModel; + FieldItem newFir; + + IClusterControl cmpTpl; + + ItemEntry(ServiceContext sc, C model) throws TemplateEngineException { + super(sc, itemConfig); + + oldModel = model; + + cmpTpl = factory.newTemplate(itemConfig.getString("cmp"), IEditor.Mode.VIEW); + addExtensionPoint("cmp"); + + String oldModelId = cmpTpl.getClusterConfig().getString(RenderService.MODEL_ID); + ModelReference oldModelRef = new ModelReference(oldModelId, model); + oldModelRef.init(sc); + + cmpTpl.start(); + } + + ItemEntry(ServiceContext sc, C oldModel, C newModel) throws TemplateEngineException { + super(sc, itemConfig); + + this.oldModel = oldModel; + this.newModel = newModel; + + cmpTpl = factory.newTemplate(itemConfig.getString("cmp"), IEditor.Mode.COMPARE); + if (cmpTpl.getClusterConfig().getReferences().contains("model.compareTo")) { + addExtensionPoint("cmp"); + + String oldModelId = cmpTpl.getClusterConfig().getString("model.compareTo"); + ModelReference oldModelRef = new ModelReference(oldModelId, oldModel); + oldModelRef.init(sc); + + String newModelId = cmpTpl.getClusterConfig().getString(RenderService.MODEL_ID); + ModelReference newModelRef = new ModelReference(newModelId, newModel); + newModelRef.init(sc); + + cmpTpl.start(); + + } else { + cmpTpl = null; + + addExtensionPoint("old"); + addExtensionPoint("new"); + + if (oldModel != null) { + IClusterControl template = factory.newTemplate(itemConfig.getString("old"), IEditor.Mode.VIEW); + oldFir = new FieldItem(sc, oldModel, null, template, null); + } + if (newModel != null) { + IClusterControl template = factory.newTemplate(itemConfig.getString("new"), IEditor.Mode.VIEW); + newFir = new FieldItem(sc, newModel, null, template, null); + } + } + } + + @Override + public String getVariation() { + if (oldFir != null || newFir != null) { + return "compat"; + } + return super.getVariation(); + } + + void destroy() { + if (oldFir != null) { + oldFir.destroy(); + } + if (newFir != null) { + newFir.destroy(); + } + if (cmpTpl != null) { + cmpTpl.stop(); + } + ((ServiceContext) getPluginContext()).stop(); + } + + @Override + public void onDetach() { + if (oldFir != null) { + oldFir.detach(); + } + if (newFir != null) { + newFir.detach(); + } + super.onDetach(); + } + } + + private IPluginContext context; + @SuppressWarnings("unused") + private IPluginConfig config; + private ITemplateFactory factory; + private Set childTemplates; + private JavaPluginConfig itemConfig; + private Comparer comparer; + + public ComparingController(IPluginContext context, IPluginConfig config, ITemplateFactory factory, + Comparer comparer, String itemId) { + this.context = context; + this.config = config; + this.factory = factory; + this.comparer = comparer; + + this.itemConfig = new JavaPluginConfig(); + itemConfig.put("wicket.id", itemId); + itemConfig.put("cmp", itemId + ".cmp"); + itemConfig.put("old", itemId + ".old"); + itemConfig.put("new", itemId + ".new"); + + childTemplates = new HashSet(); + } + + public void start(AbstractProvider oldProvider, AbstractProvider newProvider, ITypeDescriptor type) { + boolean identical = false; + if (oldProvider.size() == newProvider.size()) { + identical = true; + Iterator oldIter = oldProvider.iterator(0, oldProvider.size()); + Iterator newIter = newProvider.iterator(0, newProvider.size()); + while (oldIter.hasNext()) { + C oldModel = oldIter.next(); + if (!newIter.hasNext()) { + identical = false; + break; + } + C newModel = newIter.next(); + if (!comparer.areEqual(oldModel, newModel)) { + identical = false; + break; + } + } + if (newIter.hasNext()) { + identical = false; + } + } + if (!identical) { + Iterator oldIter = oldProvider.iterator(0, oldProvider.size()); + Iterator newIter = newProvider.iterator(0, newProvider.size()); + while (oldIter.hasNext()) { + C model = oldIter.next(); + if (newIter.hasNext()) { + addModelComparison(model, newIter.next()); + } else { + addModelComparison(model, null); + } + } + while (newIter.hasNext()) { + addModelComparison(null, newIter.next()); + } + } else { + Iterator oldIter = oldProvider.iterator(0, oldProvider.size()); + while (oldIter.hasNext()) { + addModelView(oldIter.next()); + } + } + } + + public void stop() { + for (ItemEntry entry : childTemplates) { + entry.destroy(); + } + childTemplates.clear(); + } + + public ItemEntry getFieldItem(IRenderService renderer) { + return (ItemEntry) renderer; + } + + private void addModelView(C model) { + try { + ServiceContext serviceContext = new ServiceContext(context); + childTemplates.add(new ItemEntry(serviceContext, model)); + } catch (TemplateEngineException ex) { + log.error("Failed to open editor for new model", ex); + } + } + + private void addModelComparison(C oldModel, C newModel) { + try { + ServiceContext serviceContext = new ServiceContext(context); + childTemplates.add(new ItemEntry(serviceContext, oldModel, newModel)); + } catch (TemplateEngineException ex) { + log.error("Failed to open editor for new model", ex); + } + } + + public void detach() { + for (ItemEntry entry : childTemplates) { + entry.detach(); + } + } + +} Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ComparingController.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Copied: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItem.java (from rev 22013, hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItemRenderer.java) =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItem.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItem.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,141 @@ +/* + * Copyright 2009 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.editor.plugins.field; + +import java.util.Iterator; +import java.util.List; + +import org.apache.wicket.model.IDetachable; +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.editor.validator.FilteredValidationModel; +import org.hippoecm.frontend.model.ModelReference; +import org.hippoecm.frontend.model.event.IObservable; +import org.hippoecm.frontend.model.event.IObserver; +import org.hippoecm.frontend.model.event.Observer; +import org.hippoecm.frontend.plugin.IClusterControl; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.service.render.RenderService; +import org.hippoecm.frontend.validation.IValidationListener; +import org.hippoecm.frontend.validation.IValidationResult; +import org.hippoecm.frontend.validation.IValidationService; +import org.hippoecm.frontend.validation.ModelPathElement; +import org.hippoecm.frontend.validation.ValidationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class FieldItem implements IDetachable { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + static final Logger log = LoggerFactory.getLogger(FieldItem.class); + + private IPluginContext context; + private IClusterControl clusterControl; + private ModelReference modelRef; + private FilteredValidationModel filteredValidationModel; + private IObserver validationObserver; + private IValidationService validationService; + + public FieldItem(final IPluginContext context, final C model, + final IModel validationModel, IClusterControl control, final ModelPathElement element) { + this.context = context; + + String modelId = control.getClusterConfig().getString(RenderService.MODEL_ID); + modelRef = new ModelReference(modelId, model); + modelRef.init(context); + + validationService = null; + if (validationModel != null && validationModel.getObject() != null) { + filteredValidationModel = new FilteredValidationModel(validationModel, element); + final String validationServiceId = control.getClusterConfig().getString(IValidationService.VALIDATE_ID); + if (validationServiceId != null) { + validationService = new IValidationService() { + private static final long serialVersionUID = 1L; + + public IValidationResult getValidationResult() { + return filteredValidationModel.getObject(); + } + + public void validate() throws ValidationException { + throw new ValidationException("Initiating validation from template is unsupported"); + } + + }; + context.registerService(validationService, validationServiceId); + if (validationModel instanceof IObservable) { + context.registerService(validationObserver = new Observer((IObservable) validationModel) { + + public void onEvent(Iterator events) { + List listeners = context.getServices(validationServiceId, + IValidationListener.class); + for (IValidationListener listener : listeners) { + listener.onValidation(filteredValidationModel.getObject()); + } + } + + }, IObserver.class.getName()); + } + } + } else { + if (control.getClusterConfig().containsKey(IValidationService.VALIDATE_ID)) { + log.warn("Template supports validation, but container does not provide validator model"); + } + } + + this.clusterControl = control; + + control.start(); + } + + public void destroy() { + String validationServiceId = clusterControl.getClusterConfig().getString(IValidationService.VALIDATE_ID); + if (validationServiceId != null) { + context.unregisterService(validationObserver, IObserver.class.getName()); + context.unregisterService(validationService, validationServiceId); + validationService = null; + } + modelRef.destroy(); + clusterControl.stop(); + } + + public String getRendererId() { + return clusterControl.getClusterConfig().getString("wicket.id"); + } + + public C getModel() { + return (C) modelRef.getModel(); + } + + boolean hasValidation() { + return validationService != null; + } + + public boolean isValid() { + if (filteredValidationModel != null && filteredValidationModel.getObject() != null) { + return filteredValidationModel.getObject().isValid(); + } + return true; + } + + public void detach() { + if (filteredValidationModel != null) { + filteredValidationModel.detach(); + } + } + +} Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItem.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Deleted: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItemRenderer.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItemRenderer.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldItemRenderer.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -1,141 +0,0 @@ -/* - * Copyright 2009 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.editor.plugins.field; - -import java.util.Iterator; -import java.util.List; - -import org.apache.wicket.model.IDetachable; -import org.apache.wicket.model.IModel; -import org.hippoecm.frontend.editor.validator.FilteredValidationModel; -import org.hippoecm.frontend.model.ModelReference; -import org.hippoecm.frontend.model.event.IObservable; -import org.hippoecm.frontend.model.event.IObserver; -import org.hippoecm.frontend.model.event.Observer; -import org.hippoecm.frontend.plugin.IClusterControl; -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.service.render.RenderService; -import org.hippoecm.frontend.validation.IValidationListener; -import org.hippoecm.frontend.validation.IValidationResult; -import org.hippoecm.frontend.validation.IValidationService; -import org.hippoecm.frontend.validation.ModelPathElement; -import org.hippoecm.frontend.validation.ValidationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class FieldItemRenderer implements IDetachable { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - static final Logger log = LoggerFactory.getLogger(FieldItemRenderer.class); - - private IPluginContext context; - private IClusterControl clusterControl; - private ModelReference modelRef; - private FilteredValidationModel filteredValidationModel; - private IObserver validationObserver; - private IValidationService validationService; - - public FieldItemRenderer(final IPluginContext context, final C model, - final IModel validationModel, IClusterControl control, final ModelPathElement element) { - this.context = context; - - String modelId = control.getClusterConfig().getString(RenderService.MODEL_ID); - modelRef = new ModelReference(modelId, model); - modelRef.init(context); - - validationService = null; - if (validationModel != null && validationModel.getObject() != null) { - filteredValidationModel = new FilteredValidationModel(validationModel, element); - final String validationServiceId = control.getClusterConfig().getString(IValidationService.VALIDATE_ID); - if (validationServiceId != null) { - validationService = new IValidationService() { - private static final long serialVersionUID = 1L; - - public IValidationResult getValidationResult() { - return filteredValidationModel.getObject(); - } - - public void validate() throws ValidationException { - throw new ValidationException("Initiating validation from template is unsupported"); - } - - }; - context.registerService(validationService, validationServiceId); - if (validationModel instanceof IObservable) { - context.registerService(validationObserver = new Observer((IObservable) validationModel) { - - public void onEvent(Iterator events) { - List listeners = context.getServices(validationServiceId, - IValidationListener.class); - for (IValidationListener listener : listeners) { - listener.onValidation(filteredValidationModel.getObject()); - } - } - - }, IObserver.class.getName()); - } - } - } else { - if (control.getClusterConfig().containsKey(IValidationService.VALIDATE_ID)) { - log.warn("Template supports validation, but container does not provide validator model"); - } - } - - this.clusterControl = control; - - control.start(); - } - - public void destroy() { - String validationServiceId = clusterControl.getClusterConfig().getString(IValidationService.VALIDATE_ID); - if (validationServiceId != null) { - context.unregisterService(validationObserver, IObserver.class.getName()); - context.unregisterService(validationService, validationServiceId); - validationService = null; - } - modelRef.destroy(); - clusterControl.stop(); - } - - public String getRendererId() { - return clusterControl.getClusterConfig().getString("wicket.id"); - } - - public C getModel() { - return (C) modelRef.getModel(); - } - - boolean hasValidation() { - return validationService != null; - } - - boolean isValid() { - if (filteredValidationModel != null && filteredValidationModel.getObject() != null) { - return filteredValidationModel.getObject().isValid(); - } - return true; - } - - public void detach() { - if (filteredValidationModel != null) { - filteredValidationModel.detach(); - } - } - -} Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -37,6 +37,7 @@ import org.hippoecm.frontend.plugin.config.IClusterConfig; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.render.RenderService; import org.hippoecm.frontend.session.UserSession; import org.hippoecm.frontend.types.IFieldDescriptor; @@ -137,7 +138,7 @@ if (descriptor != null) { ITemplateEngine engine = getTemplateEngine(); try { - IClusterConfig target = engine.getTemplate(descriptor.getTypeDescriptor(), "edit"); + IClusterConfig target = engine.getTemplate(descriptor.getTypeDescriptor(), IEditor.Mode.EDIT); panel = new TemplateParameterEditor(TEMPLATE_PARAMETER_EDITOR, getClusterParameters(edit), target, edit); } catch (TemplateEngineException e) { Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ITemplateFactory.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ITemplateFactory.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/ITemplateFactory.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -19,9 +19,10 @@ import org.apache.wicket.model.IModel; import org.hippoecm.frontend.editor.TemplateEngineException; import org.hippoecm.frontend.plugin.IClusterControl; +import org.hippoecm.frontend.service.IEditor; public interface ITemplateFactory extends IClusterable { final static String SVN_ID = "$Id$"; - IClusterControl getTemplate(C model) throws TemplateEngineException; + IClusterControl newTemplate(String id, IEditor.Mode mode) throws TemplateEngineException; } Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.html =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.html 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.html 2010-03-17 16:44:02 UTC (rev 22155) @@ -21,14 +21,20 @@ *
    -
    - - - -
    -
    +
    + +
    +     + +
    + + + +
    +
    +     Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/NodeFieldPlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -27,6 +27,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; import org.hippoecm.frontend.editor.TemplateEngineException; @@ -130,13 +131,20 @@ } @Override - protected void onAddRenderService(Item item, IRenderService renderer) { - final JcrNodeModel model = getController().findItemRenderer(renderer).getModel(); + protected void populateViewItem(Item item) { + Fragment fragment = new TransparentFragment("fragment", "view-fragment", this); + item.add(fragment); + } + + @Override + protected void populateEditItem(Item item, final JcrNodeModel model) { + Fragment fragment = new TransparentFragment("fragment", "edit-fragment", this); + final int index = item.getIndex(); WebMarkupContainer controls = new WebMarkupContainer("controls"); controls.setVisible(canRemoveItem() || canReorderItems()); - item.add(controls); + fragment.add(controls); MarkupContainer remove = new AjaxLink("remove") { private static final long serialVersionUID = 1L; @@ -188,8 +196,16 @@ boolean isLast = (index == provider.size() - 1); downLink.setEnabled(!isLast); controls.add(downLink); + + item.add(fragment); } + @Override + protected void populateCompareItem(Item item) { + Fragment fragment = new TransparentFragment("fragment", "view-fragment", this); + item.add(fragment); + } + protected Component createAddLink() { if (canAddItem()) { return new AjaxLink("add") { Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.html =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.html 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.html 2010-03-17 16:44:02 UTC (rev 22155) @@ -21,14 +21,20 @@ *
    -
    - - - -
    -
    +
    + +
    +     + +
    + + + +
    +
    +     Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/PropertyFieldPlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -25,6 +25,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; import org.hippoecm.frontend.model.AbstractProvider; @@ -78,9 +79,9 @@ add(createAddLink()); } - private JcrPropertyModel newPropertyModel() { + private JcrPropertyModel newPropertyModel(JcrNodeModel model) { IFieldDescriptor field = getFieldHelper().getField(); - JcrItemModel itemModel = new JcrItemModel(((JcrNodeModel) getDefaultModel()).getItemModel().getPath() + "/" + JcrItemModel itemModel = new JcrItemModel(model.getItemModel().getPath() + "/" + field.getPath()); return new JcrPropertyModel(itemModel); } @@ -88,7 +89,7 @@ protected void subscribe() { IFieldDescriptor field = getFieldHelper().getField(); if (!field.getPath().equals("*")) { - propertyModel = newPropertyModel(); + propertyModel = newPropertyModel((JcrNodeModel) getDefaultModel()); nrValues = propertyModel.size(); getPluginContext().registerService(propertyObserver = new IObserver() { private static final long serialVersionUID = 1L; @@ -122,7 +123,7 @@ protected AbstractProvider newProvider(IFieldDescriptor descriptor, ITypeDescriptor type, IModel nodeModel) { if (!descriptor.getPath().equals("*")) { - return new PropertyValueProvider(descriptor, type, newPropertyModel().getItemModel()); + return new PropertyValueProvider(descriptor, type, newPropertyModel((JcrNodeModel) nodeModel).getItemModel()); } return null; } @@ -156,14 +157,18 @@ } @Override - protected void onAddRenderService(Item item, IRenderService renderer) { - super.onAddRenderService(item, renderer); + protected void populateViewItem(Item item) { + Fragment fragment = new TransparentFragment("fragment", "view-fragment", this); + item.add(fragment); + } - final JcrPropertyValueModel model = getController().findItemRenderer(renderer).getModel(); + @Override + protected void populateEditItem(Item item, final JcrPropertyValueModel model) { + Fragment fragment = new TransparentFragment("fragment", "edit-fragment", this); WebMarkupContainer controls = new WebMarkupContainer("controls"); controls.setVisible(canRemoveItem() || canReorderItems()); - item.add(controls); + fragment.add(controls); MarkupContainer remove = new AjaxLink("remove") { private static final long serialVersionUID = 1L; @@ -209,8 +214,16 @@ } downLink.setEnabled(!isLast); controls.add(downLink); + + item.add(fragment); } + @Override + protected void populateCompareItem(Item item) { + Fragment fragment = new TransparentFragment("fragment", "view-fragment", this); + item.add(fragment); + } + // privates protected Component createAddLink() { Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TemplateController.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TemplateController.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TemplateController.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -40,20 +40,22 @@ static final Logger log = LoggerFactory.getLogger(TemplateController.class); + private String itemId; private IPluginContext context; @SuppressWarnings("unused") private IPluginConfig config; private ITemplateFactory factory; private IModel validationModel; - private Map> childTemplates; + private Map> childTemplates; public TemplateController(IPluginContext context, IPluginConfig config, IModel validationModel, - ITemplateFactory factory) { + ITemplateFactory factory, String itemId) { this.context = context; this.config = config; this.validationModel = validationModel; this.factory = factory; - childTemplates = new HashMap>(); + this.itemId = itemId; + childTemplates = new HashMap>(); } public void start(AbstractProvider provider) { @@ -65,15 +67,15 @@ } public void stop() { - for (Map.Entry> entry : childTemplates.entrySet()) { - FieldItemRenderer renderer = entry.getValue(); + for (Map.Entry> entry : childTemplates.entrySet()) { + FieldItem renderer = entry.getValue(); renderer.destroy(); } childTemplates.clear(); } - public FieldItemRenderer findItemRenderer(IRenderService renderer) { - for (Map.Entry> entry : childTemplates.entrySet()) { + public FieldItem getFieldItem(IRenderService renderer) { + for (Map.Entry> entry : childTemplates.entrySet()) { String renderId = entry.getValue().getRendererId(); if (renderer == context.getService(renderId, IRenderService.class)) { return entry.getValue(); @@ -84,15 +86,15 @@ private void addModel(final C model, ModelPathElement element) { try { - IClusterControl control = factory.getTemplate(model); - childTemplates.put(model, new FieldItemRenderer(context, model, validationModel, control, element)); + IClusterControl control = factory.newTemplate(itemId, null); + childTemplates.put(model, new FieldItem(context, model, validationModel, control, element)); } catch (TemplateEngineException ex) { log.error("Failed to open editor for new model", ex); } } public void detach() { - for (Map.Entry> entry : childTemplates.entrySet()) { + for (Map.Entry> entry : childTemplates.entrySet()) { entry.getValue().detach(); } } Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TransparentFragment.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TransparentFragment.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TransparentFragment.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,32 @@ +/* + * Copyright 2010 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.editor.plugins.field; + +import org.apache.wicket.MarkupContainer; +import org.apache.wicket.markup.html.panel.Fragment; + +public class TransparentFragment extends Fragment { + private static final long serialVersionUID = 1L; + + public TransparentFragment(String id, String markupId, MarkupContainer markupProvider) { + super(id, markupId, markupProvider); + } + + @Override + public boolean isTransparentResolver() { + return true; + } +} \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/TransparentFragment.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -66,10 +66,7 @@ controllers = new HashMap(); - mode = config.getString(ITemplateEngine.MODE); - if (mode == null) { - log.error("No edit mode specified"); - } + mode = config.getString(ITemplateEngine.MODE, "view"); ITemplateEngine engine = context.getService(config.getString(ITemplateEngine.ENGINE), ITemplateEngine.class); Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.html =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.html (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.html 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,22 @@ + + + +
    +
    [ template goes here ]
    +
    +     + Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.java (rev 0) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,106 @@ +/* + * Copyright 2010 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.editor.viewer; + +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.editor.ITemplateEngine; +import org.hippoecm.frontend.editor.TemplateEngineException; +import org.hippoecm.frontend.editor.impl.TemplateEngineFactory; +import org.hippoecm.frontend.model.ModelReference; +import org.hippoecm.frontend.plugin.IClusterControl; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.config.IClusterConfig; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; +import org.hippoecm.frontend.service.IEditor; +import org.hippoecm.frontend.service.render.RenderPlugin; +import org.hippoecm.frontend.service.render.RenderService; +import org.hippoecm.frontend.types.ITypeDescriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ComparePlugin extends RenderPlugin { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private static final Logger log = LoggerFactory.getLogger(ComparePlugin.class); + + private ModelReference modelService; + private IClusterControl cluster; + private String engineId; + private ITemplateEngine engine; + + public ComparePlugin(IPluginContext context, IPluginConfig properties) { + super(context, properties); + + TemplateEngineFactory factory = new TemplateEngineFactory(null); + engine = factory.getService(context); + context.registerService(factory, ITemplateEngine.class.getName()); + engineId = context.getReference(factory).getServiceId(); + + addExtensionPoint("template"); + } + + @Override + protected void onStart() { + super.onStart(); + modelChanged(); + } + + @Override + public void onModelChanged() { + if (cluster != null) { + modelService.destroy(); + modelService = null; + cluster.stop(); + cluster = null; + } + createTemplate(); + redraw(); + } + + protected void createTemplate() { + IModel model = getDefaultModel(); + if (model != null && model.getObject() != null) { + try { + ITypeDescriptor type = engine.getType(model); + IPluginContext context = getPluginContext(); + + IClusterConfig template = engine.getTemplate(type, IEditor.Mode.COMPARE); + IPluginConfig parameters = new JavaPluginConfig(); + parameters.put(RenderService.WICKET_ID, getPluginConfig().getString("template")); + parameters.put(ITemplateEngine.ENGINE, engineId); + parameters.put(ITemplateEngine.MODE, "compare"); + parameters.put("model.compareTo", getPluginConfig().get("model.compareTo")); + + cluster = context.newCluster(template, parameters); + String modelId = cluster.getClusterConfig().getString(RenderService.MODEL_ID); + if (modelId != null) { + modelService = new ModelReference(modelId, model); + modelService.init(context); + cluster.start(); + } else { + log.warn("No model specified in template for type " + type.getName()); + } + } catch (TemplateEngineException ex) { + log.error("Unable to open template", ex); + } + } + } + +} Property changes on: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ComparePlugin.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ViewerPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ViewerPlugin.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/viewer/ViewerPlugin.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -25,6 +25,7 @@ import org.hippoecm.frontend.plugin.config.IClusterConfig; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.service.render.RenderService; import org.hippoecm.frontend.types.ITypeDescriptor; @@ -80,7 +81,7 @@ ITypeDescriptor type = engine.getType(model); IPluginContext context = getPluginContext(); - IClusterConfig template = engine.getTemplate(type, "view"); + IClusterConfig template = engine.getTemplate(type, IEditor.Mode.VIEW); IPluginConfig parameters = new JavaPluginConfig(); parameters.put(RenderService.WICKET_ID, getPluginConfig().getString("template")); parameters.put(ITemplateEngine.ENGINE, engineId); Added: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/EditorFactoryTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/EditorFactoryTest.java (rev 0) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/EditorFactoryTest.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,418 @@ +/* + * Copyright 2010 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.editor; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.List; +import java.util.Map; + +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import javax.jcr.version.Version; + +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.util.collections.MiniMap; +import org.hippoecm.frontend.PluginTest; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.model.event.IRefreshable; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.Plugin; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugin.config.impl.JcrPluginConfig; +import org.hippoecm.frontend.service.EditorException; +import org.hippoecm.frontend.service.IEditor; +import org.hippoecm.frontend.service.IEditorFilter; +import org.hippoecm.frontend.service.IEditorManager; +import org.hippoecm.frontend.service.IRenderService; +import org.hippoecm.frontend.service.ITitleDecorator; +import org.hippoecm.frontend.service.IEditor.Mode; +import org.hippoecm.frontend.service.render.RenderPlugin; +import org.hippoecm.repository.HippoStdNodeType; +import org.hippoecm.repository.api.HippoNodeType; +import org.hippoecm.repository.api.HippoSession; +import org.hippoecm.repository.reviewedactions.PublishableDocument; +import org.junit.Test; + +public class EditorFactoryTest extends PluginTest { + + static final String EDITORS = "editors"; + static final String PREVIEWS = "previews"; + static final String COMPARERS = "compares"; + static final String FILTERS = "filters"; + static final String RENDERERS = "service.renderer"; + + public static class Editor extends RenderPlugin { + private static final long serialVersionUID = 1L; + + public Editor(IPluginContext context, IPluginConfig config) { + super(context, config); + + context.registerService(this, EDITORS); + } + } + + public static class Preview extends RenderPlugin implements ITitleDecorator { + private static final long serialVersionUID = 1L; + + public Preview(IPluginContext context, IPluginConfig config) { + super(context, config); + + context.registerService(this, PREVIEWS); + } + + public IModel getTitle() { + try { + return new Model(((JcrNodeModel) getModel()).getNode().getName()); + } catch (RepositoryException ex) { + throw new RuntimeException("failed to determine node name", ex); + } + } + } + + public static class Comparer extends RenderPlugin { + private static final long serialVersionUID = 1L; + + public Comparer(IPluginContext context, IPluginConfig config) { + super(context, config); + + context.registerService(this, COMPARERS); + } + } + + public static class CloseFilter extends Plugin implements IEditorFilter { + private static final long serialVersionUID = 1L; + + boolean closed = false; + + public CloseFilter(IPluginContext context, IPluginConfig config) { + super(context, config); + + IEditor editor = context.getService(config.getString("editor.id"), IEditor.class); + context.registerService(this, context.getReference(editor).getServiceId()); + + context.registerService(this, FILTERS); + } + + public Object preClose() { + closed = true; + return new Object(); + } + + public void postClose(Object object) { + } + } + + private List getPreviews() { + return context.getServices(PREVIEWS, IRenderService.class); + } + + private List getEditors() { + return context.getServices(EDITORS, IRenderService.class); + } + + private List getComparers() { + return context.getServices(COMPARERS, IRenderService.class); + } + + private List getCloseFilters() { + return context.getServices(FILTERS, CloseFilter.class); + } + + private final class TestEditorContext implements IEditorContext { + public IEditorManager getEditorManager() { + // TODO Auto-generated method stub + return null; + } + + public void onClose() { + // TODO Auto-generated method stub + + } + + public void onFocus() { + // TODO Auto-generated method stub + + } + } + + final static String[] content1 = { + "/test", "nt:unstructured", + "/test/content", "nt:unstructured", + "jcr:mixinTypes", "mix:referenceable" + }; + final static String[] content2 = { + "/test/facetsearch", "hippo:facetsearch", + "hippo:docbase", "/test/content", + "hippo:queryname", "state", + "hippo:facets", HippoStdNodeType.HIPPOSTD_STATE, + "/test/mirror", "hippo:mirror", + "hippo:docbase", "/test/content", + "/test/plugin", "frontend:pluginconfig", + "cluster.edit.name", "editor", + "cluster.preview.name", "preview", + "cluster.compare.name", "compare", + "/test/plugin/cluster.edit.options", "frontend:pluginconfig", + "wicket.id", RENDERERS, + "/test/plugin/cluster.preview.options", "frontend:pluginconfig", + "wicket.id", RENDERERS, + "/test/plugin/cluster.compare.options", "frontend:pluginconfig", + "wicket.id", RENDERERS, + "/config/test-app/editor", "frontend:plugincluster", + "frontend:references", "wicket.model", + "frontend:services", "wicket.id", + "/config/test-app/editor/plugin", "frontend:plugin", + "plugin.class", Editor.class.getName(), + "wicket.id", "${wicket.id}", + "/config/test-app/preview", "frontend:plugincluster", + "frontend:references", "wicket.model", + "frontend:references", "editor.id", + "frontend:services", "wicket.id", + "/config/test-app/preview/plugin", "frontend:plugin", + "plugin.class", Preview.class.getName(), + "wicket.id", "${wicket.id}", + "wicket.model", "${wicket.model}", + "/config/test-app/preview/filter", "frontend:plugin", + "plugin.class", CloseFilter.class.getName(), + "editor.id", "${editor.id}", + "/config/test-app/compare", "frontend:plugincluster", + "frontend:references", "wicket.model", + "frontend:references", "model.compareTo", + "frontend:services", "wicket.id", + "/config/test-app/compare/plugin", "frontend:plugin", + "plugin.class", Comparer.class.getName(), + "wicket.id", "${wicket.id}", + "wicket.model", "${wicket.model}", + "model.compareTo", "${model.compareTo}", + }; + + final static String[] testdocument = new String[] { + "/${name}", "hippo:handle", + "jcr:mixinTypes", "hippo:hardhandle", + "/${name}/${name}", "cmstest:document", + "jcr:mixinTypes", "hippo:harddocument", + HippoStdNodeType.HIPPOSTD_STATE, HippoStdNodeType.UNPUBLISHED, + HippoStdNodeType.HIPPOSTD_STATESUMMARY, HippoStdNodeType.NEW, + "hippostdpubwf:createdBy", "admin", + "hippostdpubwf:creationDate", "2010-02-04T16:32:28.068+02:00", + "hippostdpubwf:lastModifiedBy", "admin", + "hippostdpubwf:lastModificationDate", "2010-02-04T16:32:28.068+02:00" + + }; + + IPluginConfig config; + + @Override + public void setUp() throws Exception { + super.setUp(); + + build(session, content1); + session.save(); + build(session, content2); + session.save(); + + config = new JcrPluginConfig(new JcrNodeModel("/test/plugin")); + } + + protected void createDocument(String name) throws RepositoryException { + Map pars = new MiniMap(1); + pars.put("name", name); + build(session, mount("/test/content", instantiate(testdocument, pars))); + } + + @Test + public void testReviewedActionsEditing() throws Exception { + createDocument("document"); + + EditorFactory factory = new EditorFactory(context, config); + IEditor editor = factory.newEditor(new TestEditorContext(), new JcrNodeModel("/test/content/document"), + Mode.VIEW); + + // simulate workflow step "obtainEditableInstance" + Node unpublished = session.getRootNode().getNode("test/content/document/document"); + Node draft = ((HippoSession) session).copy(unpublished, unpublished.getPath()); + draft.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "draft"); + draft.setProperty(HippoStdNodeType.HIPPOSTD_HOLDER, CREDENTIALS.getString("username")); + session.save(); + + if (editor instanceof IRefreshable) { + ((IRefreshable) editor).refresh(); + } + assertEquals(Mode.EDIT, editor.getMode()); + } + + @Test + public void testEditPublished() throws Exception { + createDocument("document"); + + Node unpublished = session.getRootNode().getNode("test/content/document/document"); + unpublished.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "published"); + session.save(); + + EditorFactory factory = new EditorFactory(context, config); + IEditor editor = factory.newEditor(new TestEditorContext(), new JcrNodeModel("/test/content/document"), + Mode.VIEW); + + // simulate workflow step "obtainEditableInstance" + Node draft = ((HippoSession) session).copy(unpublished, unpublished.getPath()); + draft.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "draft"); + draft.setProperty(HippoStdNodeType.HIPPOSTD_HOLDER, CREDENTIALS.getString("username")); + session.save(); + ((IRefreshable) editor).refresh(); + assertEquals(Mode.EDIT, editor.getMode()); + + // simulate "commitEditableInstance" + draft.setProperty(HippoStdNodeType.HIPPOSTD_STATE, "unpublished"); + session.save(); + ((IRefreshable) editor).refresh(); + assertEquals(Mode.COMPARE, editor.getMode()); + } + + @Test + public void testSetMode() throws Exception { + + String[] workflowConfig = { + "/publishable", "hipposys:workflow", + "hipposys:nodetype", "hippostd:publishable", + "hipposys:classname", org.hippoecm.repository.reviewedactions.FullReviewedActionsWorkflowImpl.class.getName(), + "hipposys:display", "publishable workflow", + "/publishable/hipposys:types/" + PublishableDocument.class.getName(), "hipposys:type", + "hipposys:classname", PublishableDocument.class.getName(), + "hipposys:display", "publisahble document", + "hipposys:nodetype", "hippostd:publishable" + }; + build(session, mount("/hippo:configuration/hippo:workflows/default", workflowConfig)); + Node category = session.getRootNode().getNode("hippo:configuration/hippo:workflows/default"); + category.orderBefore("publishable", category.getNodes().nextNode().getName()); + + createDocument("document"); + + session.save(); + + EditorFactory factory = new EditorFactory(context, config); + IEditor editor = factory.newEditor(new TestEditorContext(), new JcrNodeModel("/test/content/document"), + Mode.VIEW); + + editor.setMode(IEditor.Mode.EDIT); + assertEquals(0, getPreviews().size()); + assertEquals(1, getEditors().size()); + } + + @Test + public void closeFilterIsInvoked() throws Exception { + createDocument("document"); + + EditorFactory factory = new EditorFactory(context, config); + IEditor editor = factory.newEditor(new TestEditorContext(), new JcrNodeModel("/test/content/document"), + Mode.VIEW); + + // open editor + assertEquals(1, getCloseFilters().size()); + List filters = getCloseFilters(); + + // close editor + editor.close(); + assertTrue(filters.get(0).closed); + } + + + @Test + public void testTemplateType() throws Exception { + Node test = root.getNode("test/content").addNode("template", HippoNodeType.NT_TEMPLATETYPE); + test.addNode(HippoNodeType.HIPPOSYSEDIT_NODETYPE, HippoNodeType.NT_HANDLE); + session.save(); + + // open preview + EditorFactory factory = new EditorFactory(context, config); + IEditor editor = factory.newEditor(new TestEditorContext(), new JcrNodeModel("/test/content/template"), + Mode.VIEW); + + assertEquals(1, getPreviews().size()); + assertEquals(0, getEditors().size()); + + // edit type + editor.setMode(IEditor.Mode.EDIT); + assertEquals(0, getPreviews().size()); + assertEquals(1, getEditors().size()); + + // done editing + editor.setMode(IEditor.Mode.VIEW); + assertEquals(1, getPreviews().size()); + assertEquals(0, getEditors().size()); + } + + @Test + public void testVersionedDocument() throws Exception { + createDocument("document"); + session.save(); + start(config); + + Version version = root.getNode("test/content/document").checkin(); + + EditorFactory factory = new EditorFactory(context, config); + try { + factory.newEditor(new TestEditorContext(), new JcrNodeModel(version), Mode.EDIT); + fail("Could open editor for Version"); + } catch (EditorException e) { + // ignore, this is OK + } + factory.newEditor(new TestEditorContext(), new JcrNodeModel(version), Mode.VIEW); + } + + @Test + public void deleteDocumentClosesEditor() throws Exception { + createDocument("document"); + start(config); + + // open preview + EditorFactory factory = new EditorFactory(context, config); + JcrNodeModel model = new JcrNodeModel("/test/content/document"); + IEditor editor = factory.newEditor(new TestEditorContext(), model, Mode.VIEW); + + assertEquals(1, getPreviews().size()); + + session.getRootNode().getNode("test/content").remove(); + + ((IRefreshable) editor).refresh(); + + assertEquals(0, getPreviews().size()); + } + + @Test + public void testOpenCompareForUnpublished() throws RepositoryException, EditorException { + build(session, new String[] { + "/test/document", "hippo:handle", + "jcr:mixinTypes", "hippo:hardhandle", + "/test/document/document", "hippo:document", + "jcr:mixinTypes", "hippostd:publishable", + "hippostd:state", "unpublished", + "/test/document/document", "hippo:document", + "jcr:mixinTypes", "hippostd:publishable", + "hippostd:state", "published", + }); + + EditorFactory factory = new EditorFactory(context, config); + JcrNodeModel model = new JcrNodeModel("/test/document"); + IEditor editor = factory.newEditor(new TestEditorContext(), model, Mode.VIEW); + + assertEquals(1, getComparers().size()); + assertEquals(IEditor.Mode.COMPARE, editor.getMode()); + } + +} Property changes on: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/EditorFactoryTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/builder/TemplateBuilderTest.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -46,6 +46,7 @@ import org.hippoecm.frontend.plugins.yui.layout.PageLayoutSettings; import org.hippoecm.frontend.plugins.yui.webapp.WebAppBehavior; import org.hippoecm.frontend.plugins.yui.webapp.WebAppSettings; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.types.BuiltinTypeStore; import org.hippoecm.frontend.types.IFieldDescriptor; import org.hippoecm.frontend.types.ITypeDescriptor; @@ -332,7 +333,7 @@ ITemplateEngine engine = context.getService("service.engine", ITemplateEngine.class); ITypeDescriptor type = engine.getType(nodeModel); - IClusterConfig template = engine.getTemplate(type, "edit"); + IClusterConfig template = engine.getTemplate(type, IEditor.Mode.EDIT); JavaPluginConfig parameters = new JavaPluginConfig(); parameters.put("wicket.id", "service.root"); parameters.put("wicket.model", "service.model"); @@ -368,7 +369,7 @@ ITemplateEngine engine = context.getService("service.engine", ITemplateEngine.class); ITypeDescriptor type = engine.getType(nodeModel); - IClusterConfig template = engine.getTemplate(type, "edit"); + IClusterConfig template = engine.getTemplate(type, IEditor.Mode.EDIT); JavaPluginConfig parameters = new JavaPluginConfig(); parameters.put("wicket.id", "service.root"); parameters.put("wicket.model", "service.model"); Modified: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -15,18 +15,267 @@ */ package org.hippoecm.frontend.editor.field; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.util.List; + +import javax.jcr.RepositoryException; + +import org.apache.wicket.IClusterable; import org.hippoecm.frontend.PluginTest; +import org.hippoecm.frontend.editor.ITemplateEngine; +import org.hippoecm.frontend.editor.TemplateEngineException; +import org.hippoecm.frontend.editor.plugins.field.PropertyFieldPlugin; +import org.hippoecm.frontend.model.IModelReference; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.model.event.IObservable; +import org.hippoecm.frontend.model.event.IObservationContext; +import org.hippoecm.frontend.plugin.IPluginContext; +import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugin.config.impl.JavaClusterConfig; +import org.hippoecm.frontend.plugin.config.impl.JavaPluginConfig; +import org.hippoecm.frontend.service.IEditor; +import org.hippoecm.frontend.service.render.RenderPlugin; +import org.hippoecm.frontend.types.JavaFieldDescriptor; +import org.hippoecm.frontend.types.JavaTypeDescriptor; import org.junit.Test; public class FieldPluginTest extends PluginTest { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; + public interface TestService extends IClusterable { + + String getMode(); + } + + public static class TestPlugin extends RenderPlugin implements TestService { + private static final long serialVersionUID = 1L; + + public TestPlugin(IPluginContext context, IPluginConfig config) { + super(context, config); + + context.registerService(this, "service.test"); + } + + public String getMode() { + return getPluginConfig().getString("mode"); + } + + } + String[] testData = { + "/test", "nt:unstructured", + "/test/data", "nt:unstructured", + "a", "noot", + "/test/base", "nt:unstructured", + "a", "aap", + "/test/unmodified", "nt:unstructured", + "a", "noot", + }; + + private JavaTypeDescriptor stringType; + private JavaClusterConfig template; + private JavaTypeDescriptor typeDesc; + private JcrNodeModel model; + private JavaFieldDescriptor fieldDesc; + + private IModelReference modelRef; + private ITemplateEngine engine; + + @Override + public void setUp() throws Exception { + super.setUp(); + + build(session, testData); + + template = new JavaClusterConfig(); + template.addReference("wicket.model"); + template.addService("wicket.id"); + template.addProperty("mode"); + + JavaPluginConfig plugin = new JavaPluginConfig("string-plugin"); + plugin.put("plugin.class", TestPlugin.class.getName()); + plugin.put("wicket.id", "${wicket.id}"); + plugin.put("wicket.model", "${wicket.model}"); + plugin.put("mode", "${mode}"); + template.addPlugin(plugin); + + stringType = new JavaTypeDescriptor("String", "String", null); + stringType.setIsNode(false); + typeDesc = new JavaTypeDescriptor("type", "type", null); + fieldDesc = new JavaFieldDescriptor("prefix", stringType); + fieldDesc.setName("field"); + fieldDesc.setPath("a"); + typeDesc.addField(fieldDesc); + model = new JcrNodeModel("/test/data"); + + // set up services + modelRef = createMock(IModelReference.class); + context.registerService(modelRef, "service.model"); + + engine = createMock(ITemplateEngine.class); + context.registerService(engine, "service.engine"); + } + + private JavaPluginConfig createPluginConfig(String mode) { + JavaPluginConfig config = new JavaPluginConfig("plugin"); + config.put("plugin.class", PropertyFieldPlugin.class.getName()); + config.put("wicket.id", "service.root"); + config.put("wicket.model", "service.model"); + config.put("engine", "service.engine"); + config.put("field", "field"); + if (mode != null) { + config.put("mode", mode); + } + return config; + } + @Test - public void testCssForInvalidField() throws Exception { + public void defaultModeIsView() throws RepositoryException, TemplateEngineException { + // set up expected service invocations + expect(modelRef.getModel()).andReturn(model); + expectLastCall().times(2); + modelRef.setObservationContext((IObservationContext) anyObject()); + modelRef.startObservation(); + expect(engine.getType(model)).andReturn(typeDesc); + expect(engine.getTemplate(stringType, IEditor.Mode.VIEW)).andReturn(template); + expectLastCall().times(2); + + replay(engine, modelRef); + + // play + JavaPluginConfig config = createPluginConfig(null); + start(config); + tester.startPage(home); + + tester.assertLabel("root:name", "Field"); + assertNull(tester.getComponentFromLastRenderedPage("root:add")); + assertNull(tester.getComponentFromLastRenderedPage("root:required")); + + List services = context.getServices("service.test", TestService.class); + assertEquals(1, services.size()); + assertEquals("view", services.get(0).getMode()); + + // verify + verify(engine, modelRef); } @Test - public void templateReceivesFilteredValidationResult() throws Exception { + public void compareOpensTwoInstancesWhenModeIsNotSupported() throws RepositoryException, TemplateEngineException { + // set up expected service invocations + expect(modelRef.getModel()).andReturn(model); + expectLastCall().times(2); + modelRef.setObservationContext((IObservationContext) anyObject()); + modelRef.startObservation(); + expect(engine.getType(model)).andReturn(typeDesc); + expect(engine.getTemplate(stringType, IEditor.Mode.COMPARE)).andReturn(template); + expect(engine.getTemplate(stringType, IEditor.Mode.VIEW)).andReturn(template); + expectLastCall().times(2); + + JcrNodeModel baseModel = new JcrNodeModel("/test/base"); + IModelReference baseRef = createMock(IModelReference.class); + expect(baseRef.getModel()).andReturn(baseModel); + context.registerService(baseRef, "service.base"); + + replay(engine, modelRef, baseRef); + + // play + JavaPluginConfig config = createPluginConfig("compare"); + config.put("model.compareTo", "service.base"); + start(config); + tester.startPage(home); + + tester.assertLabel("root:name", "Field"); + assertNull(tester.getComponentFromLastRenderedPage("root:add")); + assertNull(tester.getComponentFromLastRenderedPage("root:required")); + + List services = context.getServices("service.test", TestService.class); + assertEquals(2, services.size()); + assertEquals("view", services.get(0).getMode()); + assertEquals("view", services.get(1).getMode()); + + // verify + verify(engine, modelRef, baseRef); } + + @Test + public void compareViewIsOpenedWhenModeIsSupported() throws RepositoryException, TemplateEngineException { + template.addReference("model.compareTo"); + + // set up expected service invocations + expect(modelRef.getModel()).andReturn(model); + expectLastCall().times(2); + modelRef.setObservationContext((IObservationContext) anyObject()); + modelRef.startObservation(); + expect(engine.getType(model)).andReturn(typeDesc); + expect(engine.getTemplate(stringType, IEditor.Mode.COMPARE)).andReturn(template); + + JcrNodeModel baseModel = new JcrNodeModel("/test/base"); + IModelReference baseRef = createMock(IModelReference.class); + expect(baseRef.getModel()).andReturn(baseModel); + context.registerService(baseRef, "service.base"); + + replay(engine, modelRef, baseRef); + + // play + JavaPluginConfig config = createPluginConfig("compare"); + config.put("model.compareTo", "service.base"); + start(config); + tester.startPage(home); + + tester.assertLabel("root:name", "Field"); + assertNull(tester.getComponentFromLastRenderedPage("root:add")); + assertNull(tester.getComponentFromLastRenderedPage("root:required")); + + List services = context.getServices("service.test", TestService.class); + assertEquals(1, services.size()); + assertEquals("compare", services.get(0).getMode()); + + // verify + verify(engine, modelRef, baseRef); + } + + @Test + public void compareOpensViewWhenModelHasNotChanged() throws RepositoryException, TemplateEngineException { + // set up expected service invocations + expect(modelRef.getModel()).andReturn(model); + expectLastCall().times(2); + modelRef.setObservationContext((IObservationContext) anyObject()); + modelRef.startObservation(); + expect(engine.getType(model)).andReturn(typeDesc); +// expect(engine.getTemplate(stringType, IEditor.Mode.COMPARE)).andReturn(template); + expect(engine.getTemplate(stringType, IEditor.Mode.VIEW)).andReturn(template); + + JcrNodeModel baseModel = new JcrNodeModel("/test/unmodified"); + IModelReference baseRef = createMock(IModelReference.class); + expect(baseRef.getModel()).andReturn(baseModel); + context.registerService(baseRef, "service.base"); + + replay(engine, modelRef, baseRef); + + // play + JavaPluginConfig config = createPluginConfig("compare"); + config.put("model.compareTo", "service.base"); + start(config); + tester.startPage(home); + + tester.assertLabel("root:name", "Field"); + assertNull(tester.getComponentFromLastRenderedPage("root:add")); + assertNull(tester.getComponentFromLastRenderedPage("root:required")); + + List services = context.getServices("service.test", TestService.class); + assertEquals(1, services.size()); + assertEquals("view", services.get(0).getMode()); + + // verify + verify(engine, modelRef, baseRef); + } + } Modified: hippo-ecm/trunk/addon/editor/test/src/test/resources/log4j.xml =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/resources/log4j.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/test/src/test/resources/log4j.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -69,6 +69,12 @@ + + + + + + Added: hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/cmstest.cnd =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/cmstest.cnd (rev 0) +++ hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/cmstest.cnd 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,28 @@ +/* + * 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. + */ + + + + + + + + + + + +[cmstest:document] > hippo:document, hippostdpubwf:document, hippostd:publishableSummary +- cmstest:title (string) Modified: hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/extension.xml =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/extension.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/extension.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -110,5 +110,20 @@ 11006.0 + + + + hippo:initializeitem + + + http://www.hippoecm.org/cms/test/nt/1.0 + + + cmstest.cnd + + + 106.0 + + Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IEditor.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IEditor.java 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IEditor.java 2010-03-17 16:44:02 UTC (rev 22155) @@ -28,7 +28,24 @@ final static String SVN_ID = "$Id$"; enum Mode { - VIEW, EDIT + VIEW, EDIT, COMPARE; + + public static Mode fromString(String mode) { + if ("view".equals(mode)) { + return VIEW; + } else if ("edit".equals(mode)) { + return EDIT; + } else if ("compare".equals(mode)) { + return COMPARE; + } + throw new IllegalArgumentException("Unknown mode " + mode); + } + + @Override + public String toString() { + return name().toLowerCase(); + } + } Mode getMode(); Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-browser.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -390,12 +390,6 @@ frontend:plugin - - cms-editor - - - cms-preview - service.edit @@ -439,6 +433,23 @@ service.editor.tab + + + frontend:pluginconfig + + + service.browse + + + service.edit + + + service.behavior.editor.tabs.center + + + service.editor.tab + + Added: hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml (rev 0) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -0,0 +1,129 @@ + + + + + frontend:plugincluster + + + editor.id + browser.id + wicket.model + model.compareTo + wicket.behavior + + + wicket.id + + + + frontend:plugin + + + ${editor.id} + + + ${cluster.id}.viewer + + + ${cluster.id}.workflows + + + org.hippoecm.frontend.plugins.cms.edit.EditPerspective + + + ${wicket.behavior} + + + extension.editor + extension.workflow + + + ${wicket.id} + + + ${wicket.model} + + + + frontend:pluginconfig + + + id=editor-perspective-center,body=editor-perspective-center-body,scroll=true + + + true + + + editor-perspective-wrapper + + + id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 + + + + + + frontend:plugin + + + org.hippoecm.frontend.editor.viewer.ComparePlugin + + + ${cluster.id}.template + + + ${cluster.id}.viewer + + + ${wicket.model} + + + ${model.compareTo} + + + + + frontend:plugin + + + ${browser.id} + + + ${editor.id} + + + ${wicket.model} + + + org.hippoecm.addon.workflow.WorkflowsPlugin + + + ${cluster.id}.workflows + + + ${wicket.model} + + + default + versioning + custom + admin + + + + Property changes on: hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml 2010-03-17 16:19:23 UTC (rev 22154) +++ hippo-ecm/trunk/package/config/src/main/resources/hippoecm-extension.xml 2010-03-17 16:44:02 UTC (rev 22155) @@ -92,6 +92,21 @@ 900.7 + + + + hippo:initializeitem + + + cms-compare.xml + + + /hippo:configuration/hippo:frontend/cms + + + 900.8 + + From svn-logs at hippocms.org Wed Mar 17 17:45:15 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Wed Mar 17 17:50:03 2010 Subject: [HippoRepos-dev] [22156] hippo-ecm: HREPTWO-3961: use daisy diff to implement compare for xinha Message-ID: <20100317164515.AB5091C021@svn.vm.castaserver.com> Revision: 22156 Author: fvlankvelt Date: 2010-03-17 17:45:15 +0100 (Wed, 17 Mar 2010) Log Message: ----------- HREPTWO-3961: use daisy diff to implement compare for xinha Modified Paths: -------------- hippo-ecm/trunk/addon/xinha-frontend/pom.xml 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/XinhaNodePlugin.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java 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 Added Paths: ----------- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/diff.css hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/ hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/daisy/ hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/daisy/diff/ hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/daisy/diff/TestDaisyDiff.java Property Changed: ---------------- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/ Modified: hippo-ecm/trunk/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/pom.xml 2010-03-17 16:44:02 UTC (rev 22155) +++ hippo-ecm/trunk/addon/xinha-frontend/pom.xml 2010-03-17 16:45:15 UTC (rev 22156) @@ -71,10 +71,46 @@ + xerces + xercesImpl + 2.8.1 + + org.hippoecm hippo-ecm-addon-yui 2.13.00-SNAPSHOT + + org.eclipse.core + runtime + 3.3.100-v20070530 + + + org.eclipse + osgi + + + org.eclipse.core + jobs + + + org.eclipse.equinox + registry + + + org.eclipse.equinox + preferences + + + org.eclipse.core + contenttype + + + org.eclipse.equinox + app + + + @@ -102,7 +138,6 @@ junit junit - 4.4 test Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org ___________________________________________________________________ Added: svn:externals + outerj -r147 http://daisydiff.googlecode.com/svn/tags/v1.1/src/java/org/outerj eclipse -r147 http://daisydiff.googlecode.com/svn/tags/v1.1/src/java/org/eclipse 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 2010-03-17 16:44:02 UTC (rev 22155) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java 2010-03-17 16:45:15 UTC (rev 22156) @@ -40,6 +40,7 @@ import org.apache.wicket.behavior.IBehavior; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.markup.html.CSSPackageResource; import org.apache.wicket.markup.html.JavascriptPackageResource; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.TextArea; @@ -69,6 +70,7 @@ import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.DynamicTextTemplate; import org.hippoecm.frontend.service.IBrowseService; +import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.render.HeaderContributorHelper; import org.hippoecm.frontend.service.render.RenderPlugin; import org.hippoecm.frontend.session.UserSession; @@ -95,7 +97,7 @@ private final PackagedTextTemplate XINHA_INIT_GLOBALS = new PackagedTextTemplate(AbstractXinhaPlugin.class, "xinha_init.js"); - private final String mode; + private final IEditor.Mode mode; private XinhaTextArea editor; private Configuration configuration; @@ -126,8 +128,8 @@ configuration.addProperty("previewTooltipText", getString("preview.tooltip", null, "Click to edit")); configuration.setName(getMarkupId()); - mode = config.getString("mode", "view"); - if (mode.equals("edit")) { + mode = IEditor.Mode.fromString(config.getString("mode", "view")); + if (IEditor.Mode.EDIT == mode) { add(new EditorManagerBehavior()); } load(); @@ -137,7 +139,7 @@ } private void load() { - addOrReplace("edit".equals(mode) ? configuration.getEditorStarted() ? createEditor("fragment") + addOrReplace(IEditor.Mode.EDIT == mode ? configuration.getEditorStarted() ? createEditor("fragment") : createEditablePreview("fragment") : createPreview("fragment")); } @@ -147,7 +149,13 @@ } Fragment fragment = new Fragment(fragmentId, "view", this); - fragment.add(new WebMarkupContainer("value", getValueModel()) { + IModel model; + if (IEditor.Mode.COMPARE == mode) { + model = new DiffModel(getBaseModel(), getValueModel()); + } else { + model = getValueModel(); + } + fragment.add(new WebMarkupContainer("value", model) { private static final long serialVersionUID = 1L; @Override @@ -162,6 +170,9 @@ } } }); + if (IEditor.Mode.COMPARE == mode) { + fragment.add(CSSPackageResource.getHeaderContribution(AbstractXinhaPlugin.class, "diff.css")); + } return fragment; } @@ -270,6 +281,8 @@ protected abstract JcrPropertyValueModel getValueModel(); + protected abstract IModel getBaseModel(); + /** * Callback urls aren't known at construction so set them here */ Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java 2010-03-17 16:45:15 UTC (rev 22156) @@ -0,0 +1,82 @@ +/* + * Copyright 2010 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 java.io.ByteArrayOutputStream; +import java.io.StringReader; + +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import javax.xml.transform.stream.StreamResult; + +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.LoadableDetachableModel; +import org.outerj.daisy.diff.DaisyDiff; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.InputSource; +import org.xml.sax.helpers.AttributesImpl; + +public class DiffModel extends LoadableDetachableModel { + private static final long serialVersionUID = 1L; + + static final Logger log = LoggerFactory.getLogger(DiffModel.class); + + IModel original; + IModel current; + + public DiffModel(IModel orig, IModel current) { + this.original = orig; + this.current = current; + } + + @Override + protected String load() { + if (original == null || current == null) { + return null; + } + try { + InputSource oldSource = new InputSource(); + oldSource.setCharacterStream(new StringReader(original.getObject())); + + InputSource newSource = new InputSource(); + newSource.setCharacterStream(new StringReader(current.getObject())); + + SAXTransformerFactory tf = (SAXTransformerFactory) TransformerFactory.newInstance(); + TransformerHandler handler = tf.newTransformerHandler(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + StreamResult dr = new StreamResult(baos); + handler.setResult(dr); + handler.startDocument(); + handler.startElement(null, "html", "html", new AttributesImpl()); + DaisyDiff.diffHTML(oldSource, newSource, handler, null, null); + handler.endElement(null, "html", "html"); + handler.endDocument(); + + return baos.toString(); + } catch (Exception e) { + log.error(e.getMessage()); + } + return null; + } + + @Override + public void detach() { + original.detach(); + current.detach(); + } +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaNodePlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaNodePlugin.java 2010-03-17 16:44:02 UTC (rev 22155) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaNodePlugin.java 2010-03-17 16:45:15 UTC (rev 22156) @@ -19,6 +19,8 @@ import javax.jcr.Property; import javax.jcr.RepositoryException; +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.model.IModelReference; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.properties.JcrPropertyModel; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; @@ -41,6 +43,24 @@ protected JcrPropertyValueModel getValueModel() { JcrNodeModel nodeModel = (JcrNodeModel) getDefaultModel(); + return getContentModel(nodeModel); + } + + @Override + protected IModel getBaseModel() { + IPluginConfig config = getPluginConfig(); + if (!config.containsKey("model.compareTo")) { + return null; + } + IModelReference modelRef = getPluginContext().getService(config.getString("model.compareTo"), + IModelReference.class); + if (modelRef == null || modelRef.getModel() == null) { + return null; + } + return getContentModel((JcrNodeModel) modelRef.getModel()); + } + + private JcrPropertyValueModel getContentModel(JcrNodeModel nodeModel) { try { Node node = nodeModel.getNode(); if (node == null) { @@ -48,9 +68,10 @@ } Property prop = node.getProperty("hippostd:content"); return new JcrPropertyValueModel(new JcrPropertyModel(prop)); - } catch(RepositoryException ex) { + } catch (RepositoryException ex) { log.error(ex.getMessage()); } return null; } + } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java 2010-03-17 16:44:02 UTC (rev 22155) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java 2010-03-17 16:45:15 UTC (rev 22156) @@ -15,6 +15,8 @@ */ package org.hippoecm.frontend.plugins.xinha; +import org.apache.wicket.model.IModel; +import org.hippoecm.frontend.model.IModelReference; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; @@ -36,4 +38,18 @@ protected JcrPropertyValueModel getValueModel() { return (JcrPropertyValueModel) getDefaultModel(); } + + protected IModel getBaseModel() { + IPluginConfig config = getPluginConfig(); + if (!config.containsKey("model.compareTo")) { + return null; + } + IModelReference modelRef = getPluginContext().getService(config.getString("model.compareTo"), + IModelReference.class); + if (modelRef == null) { + return null; + } + return modelRef.getModel(); + } + } Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/diff.css =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/diff.css (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/diff.css 2010-03-17 16:45:15 UTC (rev 22156) @@ -0,0 +1,144 @@ +/* + * Styles for the Tag Diff + */ +span.diff-tag-html { + font-family: "Andale Mono" monospace; + font-size: 80%; +} + +span.diff-tag-removed { + font-size: 100%; + text-decoration: line-through; + background-color: #fdc6c6; /* light red */ +} + +span.diff-tag-added { + font-size: 100%; + background-color: #ccffcc; /* light green */ +} + +/* + * Styles for the HTML Diff + */ +span.diff-html-added { + font-size: 100%; + background-color: #ccffcc; /* light green */ + cursor: pointer; +} + +span.diff-html-removed { + font-size: 100%; + text-decoration: line-through; + background-color: #fdc6c6; /* light red */ + cursor: pointer; +} + +span.diff-html-changed { + background: url(../images/diffunderline.gif) bottom repeat-x; + *background-color: #c6c6fd; /* light blue */ + cursor: pointer; +} + +span.diff-html-selected { + background-color: #FF8800; /* light orange */ + cursor: pointer; +} + +span.diff-html-selected img{ + border: 2px solid #FF8800; /* light orange */ +} + +span.diff-html-added img{ + border: 2px solid #ccffcc; +} + +span.diff-html-removed img{ + border: 2px solid #fdc6c6; +} + +span.diff-html-changed img{ + border: 2px dotted #000099; + +} + +div.diff-removed-image, div.diff-added-image{ + height: 300px; + width: 200px; + position: absolute; + opacity : 0.55; + filter: alpha(opacity=55); + -moz-opacity: 0.55; +} + +div.diff-removed-image, div.diff-added-image { + margin-top: 2px; + margin-bottom: 2px; + margin-right: 2px; + margin-left: 2px; +} + +div.diff-removed-image { + background-color: #fdc6c6; + background-image: url(../images/diffmin.gif); +} +div.diff-added-image { + background-color: #ccffcc; + background-image: url(../images/diffplus.gif); + background-repeat: no-repeat; +} + +img.diff-icon { + background-color: #FF8800; + background-image: url(../images/bg_rounded.gif); + width: 16px; + height: 16px; + border: 0px none; +} + +table.diff-tooltip-link, table.diff-tooltip-link-changed { + width: 100%; + text-align: center; + Vertical-align: middle; +} + +table.diff-tooltip-link-changed { + border-top: thin dashed #000000; + margin-top: 3px; + padding-top: 3px +} +td.diff-tooltip-prev { + text-align: left; +} + +td.diff-tooltip-next { + text-align: right; +} + +table.diffpage-html-firstlast { + width: 100%; + Vertical-align: middle; +} + +div.diff-topbar{ + border-bottom: 2px solid #FF8800; + border-left: 1px solid #FF8800; + border-right: 1px solid #FF8800; + background-color: #FFF5F5; +} + +a.diffpage-html-a, a.diffpage-html-a:hover, a.diffpage-html-a:link, a.diffpage-html-a:visited, a.diffpage-html-a:active { + text-decoration: none; + color: #FF8800; +} + +.diffpage-html-firstlast a img, .dsydiff-prevnextnav a img { + vertical-align: middle; +} + +ul.changelist { + padding-left: 15px; +} + +body{ + margin-top: 0px; +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/diff.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native 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 2010-03-17 16:44:02 UTC (rev 22155) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/hippostd-html-template.xml 2010-03-17 16:45:15 UTC (rev 22156) @@ -114,6 +114,7 @@ wicket.model + model.compareTo engine @@ -202,6 +203,9 @@ service.browse + + ${model.compareTo} + frontend:pluginconfig 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 2010-03-17 16:44:02 UTC (rev 22155) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/resources/system-html-template.xml 2010-03-17 16:45:15 UTC (rev 22156) @@ -86,6 +86,7 @@ wicket.model + model.compareTo engine @@ -132,6 +133,9 @@ ${wicket.model} + + ${model.compareTo} + ${width} Added: hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/daisy/diff/TestDaisyDiff.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/daisy/diff/TestDaisyDiff.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/daisy/diff/TestDaisyDiff.java 2010-03-17 16:45:15 UTC (rev 22156) @@ -0,0 +1,68 @@ +/* + * Copyright 2010 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.outerj.daisy.diff; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.io.StringReader; + +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMResult; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; + +import org.junit.Test; +import org.w3c.dom.CharacterData; +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; + +public class TestDaisyDiff { + + @Test + public void testDiff() throws SAXException, IOException, TransformerConfigurationException { + InputSource oldSource = new InputSource(); + oldSource.setCharacterStream(new StringReader("aap")); + + InputSource newSource = new InputSource(); + newSource.setCharacterStream(new StringReader("noot")); + + SAXTransformerFactory tf = (SAXTransformerFactory) TransformerFactory.newInstance(); + TransformerHandler handler = tf.newTransformerHandler(); + DOMResult dr = new DOMResult(); + handler.setResult(dr); + handler.startDocument(); + handler.startElement(null, "html", "html", new AttributesImpl()); + DaisyDiff.diffHTML(oldSource, newSource, handler, null, null); + handler.endElement(null, "html", "html"); + handler.endDocument(); + + Document doc = (Document) dr.getNode(); + NodeList spans = doc.getElementsByTagName("span"); + assertEquals(2, spans.getLength()); + + CharacterData data = (CharacterData) spans.item(0).getFirstChild(); + assertEquals("aap", data.getData()); + + data = (CharacterData) spans.item(1).getFirstChild(); + assertEquals("noot", data.getData()); + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/outerj/daisy/diff/TestDaisyDiff.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native From helpdesk at onehippo.com Wed Mar 17 18:19:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Wed Mar 17 18:24:34 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3973) Author cannot create new document In-Reply-To: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <32312056.7214.1268846388524.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3973?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87269#action_87269 ] Jeroen Reijn commented on HREPTWO-3973: --------------------------------------- Same goes for editors if I test this in the quickstart war. > Author cannot create new document > --------------------------------- > > Key: HREPTWO-3973 > URL: http://issues.onehippo.com/browse/HREPTWO-3973 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: ongoing > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.12.08, r2.13.00 > > > menu item to create a new document is missing. > cause: security configuration too strict -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 18:21:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Wed Mar 17 18:26:34 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3957) Remove hippo:translated mixin from defaultread as it too broad In-Reply-To: <16397734.1728.1268213988678.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <20239046.7219.1268846508679.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3957?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87270#action_87270 ] Jeroen Reijn commented on HREPTWO-3957: --------------------------------------- It would be nice if the issue could describe what is meant with 'too broad' > Remove hippo:translated mixin from defaultread as it too broad > -------------------------------------------------------------- > > Key: HREPTWO-3957 > URL: http://issues.onehippo.com/browse/HREPTWO-3957 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.11, r2.06.17, r2.09.07, r2.12.06 > Reporter: Bart van der Schans > Assignee: Sylvain P?lissier > Fix For: r2.03.12, r2.06.18, r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 18:45:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Wed Mar 17 18:50:35 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3986) Renaming an image as editor in the imagegallery fails Message-ID: <22507126.7239.1268847948530.JavaMail.jira@jira.vm.castaserver.com> Renaming an image as editor in the imagegallery fails ----------------------------------------------------- Key: HREPTWO-3986 URL: http://issues.onehippo.com/browse/HREPTWO-3986 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Reporter: Jeroen Reijn Mar 16 16:27:49 myhost javax.jcr.AccessDeniedException: /content/gallery/images/onderwerpen-dossiers-208x208/economie-en-ondernemen/breedband.jpg/hippo:translation/hippo:message: not allowed to modify item Mar 16 16:27:49 myhost at org.apache.jackrabbit.core.ItemImpl.validateTransientItems(ItemImpl.java:404) Mar 16 16:27:49 myhost at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1058) Mar 16 16:27:49 myhost at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) Mar 16 16:27:49 myhost at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) Mar 16 16:27:49 myhost at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) Mar 16 16:27:49 myhost at org.hippoecm.repository.decorating.checked.SessionDecorator.save(SessionDecorator.java:227) Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:153) Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.StdWorkflow$1$1.onClick(StdWorkflow.java:58) Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) Mar 16 16:27:49 myhost at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) Mar 16 16:27:49 myhost at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) Mar 16 16:27:49 myhost at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) Mar 16 16:27:49 myhost at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) Mar 16 16:27:49 myhost at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) Mar 16 16:27:49 myhost at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) Mar 16 16:27:49 myhost at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) Mar 16 16:27:49 myhost at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) Mar 16 16:27:49 myhost at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) Mar 16 16:27:49 myhost at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) Mar 16 16:27:49 myhost at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128) Mar 16 16:27:49 myhost at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) Mar 16 16:27:49 myhost at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293) Mar 16 16:27:49 myhost at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) Mar 16 16:27:49 myhost at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) Mar 16 16:27:49 myhost at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) Mar 16 16:27:49 myhost at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) Mar 16 16:27:49 myhost at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) Mar 16 16:27:49 myhost at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690)f -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 19:04:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Wed Mar 17 19:09:34 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3987) Browser perspective looks has missing translations Message-ID: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Browser perspective looks has missing translations -------------------------------------------------- Key: HREPTWO-3987 URL: http://issues.onehippo.com/browse/HREPTWO-3987 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07 Environment: Quickstart war 2.12.08-SNAPSHOT Reporter: Jeroen Reijn Attachments: warning-in-browser-perspective.png The message states [Warning:property for 'section-documents' not found] See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Wed Mar 17 09:43:50 2010 From: helpdesk at onehippo.com (JIRA (Jettro Coenradie)) Date: Thu Mar 18 09:03:29 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3978) Deadlock in version storage - VersionManagerImpl In-Reply-To: <28596032.5996.1268746908566.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21119059.6415.1268815430185.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3978?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87107#action_87107 ] Jettro Coenradie commented on HREPTWO-3978: ------------------------------------------- Nog een: 2010-03-17 09:20:36 Full thread dump Java HotSpot(TM) 64-Bit Server VM (14.3-b01 mixed mode): "http-8080-1" daemon prio=10 tid=0x00007f349cf9f800 nid=0x7b48 in Object.wait() [0x000000004fb37000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007f3561ea0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "TP-Processor200" daemon prio=10 tid=0x00007f34924fb000 nid=0x6a19 waiting for monitor entry [0x000000004f833000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor199" daemon prio=10 tid=0x00007f34904c1800 nid=0x6a18 waiting for monitor entry [0x000000004f732000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor198" daemon prio=10 tid=0x00007f34904bf800 nid=0x6a17 waiting for monitor entry [0x000000004f631000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor197" daemon prio=10 tid=0x00007f34904bd800 nid=0x6a16 waiting for monitor entry [0x000000004f530000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor196" daemon prio=10 tid=0x00007f34904bb800 nid=0x6a11 waiting for monitor entry [0x000000004f42f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor195" daemon prio=10 tid=0x00007f34908a8800 nid=0x6a10 waiting for monitor entry [0x000000004f32e000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor194" daemon prio=10 tid=0x00007f34908a7000 nid=0x6a0f waiting for monitor entry [0x000000004f22d000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor193" daemon prio=10 tid=0x00007f34908a6000 nid=0x6a0e waiting for monitor entry [0x000000004e11c000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor192" daemon prio=10 tid=0x00007f34908a4000 nid=0x6a0b waiting for monitor entry [0x000000004f12c000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor191" daemon prio=10 tid=0x00007f34908a2000 nid=0x6a0a waiting for monitor entry [0x000000004f02b000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor190" daemon prio=10 tid=0x00007f34908a1800 nid=0x6a09 waiting for monitor entry [0x000000004ef2a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor189" daemon prio=10 tid=0x00007f3493fc7800 nid=0x6a08 waiting for monitor entry [0x000000004ee29000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor188" daemon prio=10 tid=0x00007f3493fc5800 nid=0x69f2 waiting for monitor entry [0x000000004ed28000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor187" daemon prio=10 tid=0x00007f3493fc3800 nid=0x69f1 waiting for monitor entry [0x000000004ec27000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor186" daemon prio=10 tid=0x00007f3493fc2000 nid=0x69f0 waiting for monitor entry [0x000000004eb26000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor185" daemon prio=10 tid=0x00007f349035c800 nid=0x69ef waiting for monitor entry [0x000000004ea25000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor184" daemon prio=10 tid=0x00007f349035a800 nid=0x69ea waiting for monitor entry [0x000000004e924000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor183" daemon prio=10 tid=0x00007f3490359000 nid=0x69e9 waiting for monitor entry [0x000000004e823000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor182" daemon prio=10 tid=0x00007f3490358000 nid=0x69e8 waiting for monitor entry [0x000000004e722000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor181" daemon prio=10 tid=0x00007f3490357800 nid=0x69e7 waiting for monitor entry [0x000000004e621000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor180" daemon prio=10 tid=0x00007f3490356800 nid=0x69e6 waiting for monitor entry [0x000000004e520000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor179" daemon prio=10 tid=0x00007f349155a800 nid=0x69e5 waiting for monitor entry [0x000000004e41f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor178" daemon prio=10 tid=0x00007f3491558800 nid=0x69e4 waiting for monitor entry [0x000000004e31e000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor177" daemon prio=10 tid=0x00007f3491556800 nid=0x69c7 waiting for monitor entry [0x000000004e21d000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor176" daemon prio=10 tid=0x00007f3491555000 nid=0x69c4 waiting for monitor entry [0x000000004e01b000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor175" daemon prio=10 tid=0x00007f3492b26800 nid=0x69c3 waiting for monitor entry [0x000000004df1a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor174" daemon prio=10 tid=0x00007f3492b24800 nid=0x69c2 waiting for monitor entry [0x000000004de19000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor173" daemon prio=10 tid=0x00007f3492b22800 nid=0x69c1 waiting for monitor entry [0x000000004dd18000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor172" daemon prio=10 tid=0x00007f3492b20800 nid=0x69bc waiting for monitor entry [0x000000004dc17000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor171" daemon prio=10 tid=0x00007f34917d8000 nid=0x69bb waiting for monitor entry [0x000000004db16000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor170" daemon prio=10 tid=0x00007f34917d6000 nid=0x69ba waiting for monitor entry [0x000000004da15000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor169" daemon prio=10 tid=0x00007f34917d4800 nid=0x69b9 waiting for monitor entry [0x000000004d914000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor168" daemon prio=10 tid=0x00007f34917d2800 nid=0x69b3 waiting for monitor entry [0x000000004d813000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor167" daemon prio=10 tid=0x00007f34917d1800 nid=0x69b2 waiting for monitor entry [0x000000004d712000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor166" daemon prio=10 tid=0x00007f3493872000 nid=0x69b1 waiting for monitor entry [0x000000004d611000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor165" daemon prio=10 tid=0x00007f3493870800 nid=0x69b0 waiting for monitor entry [0x000000004d510000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor164" daemon prio=10 tid=0x00007f349386e800 nid=0x6994 waiting for monitor entry [0x000000004d40f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor163" daemon prio=10 tid=0x00007f349386d000 nid=0x6993 waiting for monitor entry [0x000000004d30e000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor162" daemon prio=10 tid=0x00007f3492cf6000 nid=0x6992 waiting for monitor entry [0x000000004d20d000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor161" daemon prio=10 tid=0x00007f3492cf5800 nid=0x6991 waiting for monitor entry [0x000000004d10c000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor160" daemon prio=10 tid=0x00007f3492cf3800 nid=0x6984 waiting for monitor entry [0x000000004d00b000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor159" daemon prio=10 tid=0x00007f3492cf1800 nid=0x6983 waiting for monitor entry [0x000000004cf0a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor158" daemon prio=10 tid=0x00007f3492cef800 nid=0x6982 waiting for monitor entry [0x000000004ce09000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor157" daemon prio=10 tid=0x00007f3492cef000 nid=0x6981 waiting for monitor entry [0x000000004cd08000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor156" daemon prio=10 tid=0x00007f3490850000 nid=0x697f waiting for monitor entry [0x000000004cc07000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor155" daemon prio=10 tid=0x00007f349084e000 nid=0x697e waiting for monitor entry [0x000000004cb06000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor154" daemon prio=10 tid=0x00007f349084c000 nid=0x697d waiting for monitor entry [0x000000004ca05000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor153" daemon prio=10 tid=0x00007f349084a800 nid=0x697c waiting for monitor entry [0x000000004c904000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor152" daemon prio=10 tid=0x00007f349242f800 nid=0x6954 waiting for monitor entry [0x000000004c803000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor151" daemon prio=10 tid=0x00007f349242d800 nid=0x6953 waiting for monitor entry [0x000000004c702000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor150" daemon prio=10 tid=0x00007f349242b800 nid=0x6952 waiting for monitor entry [0x000000004c601000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor149" daemon prio=10 tid=0x00007f3492429800 nid=0x6951 waiting for monitor entry [0x000000004c500000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor148" daemon prio=10 tid=0x00007f3493acb800 nid=0x6946 waiting for monitor entry [0x000000004c3ff000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor147" daemon prio=10 tid=0x00007f3493ac9800 nid=0x6945 waiting for monitor entry [0x000000004c2fe000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor146" daemon prio=10 tid=0x00007f3493ac9000 nid=0x6944 waiting for monitor entry [0x000000004a4e0000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor145" daemon prio=10 tid=0x00007f3493ac7000 nid=0x6941 waiting for monitor entry [0x000000004c1fd000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor144" daemon prio=10 tid=0x00007f3493ac5000 nid=0x693e waiting for monitor entry [0x000000004c0fc000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor143" daemon prio=10 tid=0x00007f3493aaa800 nid=0x693d waiting for monitor entry [0x000000004bffb000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor142" daemon prio=10 tid=0x00007f3493aa8800 nid=0x693c waiting for monitor entry [0x000000004befa000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor141" daemon prio=10 tid=0x00007f3493aa7000 nid=0x693b waiting for monitor entry [0x000000004bdf9000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor140" daemon prio=10 tid=0x00007f3493aa5000 nid=0x6936 waiting for monitor entry [0x000000004bcf8000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor139" daemon prio=10 tid=0x00007f34901c4800 nid=0x6935 waiting for monitor entry [0x000000004bbf7000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor138" daemon prio=10 tid=0x00007f34901c2800 nid=0x6934 waiting for monitor entry [0x000000004baf6000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor137" daemon prio=10 tid=0x00007f34901c0800 nid=0x6933 waiting for monitor entry [0x000000004b9f5000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor136" daemon prio=10 tid=0x00007f34901be800 nid=0x692b waiting for monitor entry [0x000000004b8f4000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor135" daemon prio=10 tid=0x00007f3491c80000 nid=0x692a waiting for monitor entry [0x000000004b7f3000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor134" daemon prio=10 tid=0x00007f3491c7e000 nid=0x6929 waiting for monitor entry [0x000000004b6f2000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor133" daemon prio=10 tid=0x00007f3491c7c000 nid=0x6928 waiting for monitor entry [0x000000004b5f1000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor132" daemon prio=10 tid=0x00007f3491c7a000 nid=0x6913 waiting for monitor entry [0x000000004b4f0000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor131" daemon prio=10 tid=0x00007f3491c79800 nid=0x6912 waiting for monitor entry [0x000000004b3ef000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor130" daemon prio=10 tid=0x00007f349334a000 nid=0x6911 waiting for monitor entry [0x000000004b2ee000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor129" daemon prio=10 tid=0x00007f3493348000 nid=0x6910 waiting for monitor entry [0x000000004b1ed000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor128" daemon prio=10 tid=0x00007f3493346000 nid=0x68ee waiting for monitor entry [0x000000004b0ec000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor127" daemon prio=10 tid=0x00007f3493344000 nid=0x68ed waiting for monitor entry [0x000000004afeb000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor126" daemon prio=10 tid=0x00007f3493448800 nid=0x68ec waiting for monitor entry [0x000000004aeea000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor125" daemon prio=10 tid=0x00007f3493446800 nid=0x68eb waiting for monitor entry [0x000000004ade9000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor124" daemon prio=10 tid=0x00007f3493444800 nid=0x68e6 waiting for monitor entry [0x000000004ace8000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor123" daemon prio=10 tid=0x00007f3493442800 nid=0x68e5 waiting for monitor entry [0x000000004abe7000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor122" daemon prio=10 tid=0x00007f3490620000 nid=0x68e4 waiting for monitor entry [0x000000004aae6000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor121" daemon prio=10 tid=0x00007f349061e000 nid=0x68e3 waiting for monitor entry [0x000000004a9e5000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor120" daemon prio=10 tid=0x00007f349061c800 nid=0x68e1 waiting for monitor entry [0x000000004a8e4000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor119" daemon prio=10 tid=0x00007f349061a800 nid=0x68e0 waiting for monitor entry [0x000000004a7e3000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor118" daemon prio=10 tid=0x00007f3491e01800 nid=0x68df waiting for monitor entry [0x000000004a6e2000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor117" daemon prio=10 tid=0x00007f3491e01000 nid=0x68de waiting for monitor entry [0x000000004a5e1000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor116" daemon prio=10 tid=0x00007f3491dff000 nid=0x68d8 waiting for monitor entry [0x000000004a3df000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor115" daemon prio=10 tid=0x00007f3491dfd000 nid=0x68d7 waiting for monitor entry [0x000000004a2de000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor114" daemon prio=10 tid=0x00007f3491dfb000 nid=0x68d6 waiting for monitor entry [0x000000004a1dd000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor113" daemon prio=10 tid=0x00007f3491dfa800 nid=0x68d5 waiting for monitor entry [0x000000004a0dc000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor112" daemon prio=10 tid=0x00007f34904b8000 nid=0x68cc waiting for monitor entry [0x0000000049fdb000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor111" daemon prio=10 tid=0x00007f34904b6000 nid=0x68cb waiting for monitor entry [0x0000000049eda000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor110" daemon prio=10 tid=0x00007f34904b4000 nid=0x68ca waiting for monitor entry [0x0000000049dd9000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor109" daemon prio=10 tid=0x00007f34904b2800 nid=0x68c9 waiting for monitor entry [0x0000000049cd8000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor108" daemon prio=10 tid=0x00007f3491fd7000 nid=0x68c7 waiting for monitor entry [0x0000000049bd7000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor107" daemon prio=10 tid=0x00007f3491fd5000 nid=0x68c6 waiting for monitor entry [0x0000000049ad6000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor106" daemon prio=10 tid=0x00007f3491fd3800 nid=0x68c5 waiting for monitor entry [0x00000000499d5000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor105" daemon prio=10 tid=0x00007f3491fd1800 nid=0x68c4 waiting for monitor entry [0x00000000498d4000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor104" daemon prio=10 tid=0x00007f349229a800 nid=0x6888 waiting for monitor entry [0x00000000497d3000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor103" daemon prio=10 tid=0x00007f3492298800 nid=0x6887 waiting for monitor entry [0x00000000496d2000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor102" daemon prio=10 tid=0x00007f3492296800 nid=0x6886 waiting for monitor entry [0x00000000495d1000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor101" daemon prio=10 tid=0x00007f3492294800 nid=0x6885 waiting for monitor entry [0x00000000494d0000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor100" daemon prio=10 tid=0x00007f3492294000 nid=0x687a waiting for monitor entry [0x00000000493cf000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor99" daemon prio=10 tid=0x00007f3492b36000 nid=0x6879 waiting for monitor entry [0x00000000492ce000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor98" daemon prio=10 tid=0x00007f3492b34800 nid=0x6878 waiting for monitor entry [0x00000000491cd000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor97" daemon prio=10 tid=0x00007f3492b32800 nid=0x6877 waiting for monitor entry [0x00000000490cc000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor96" daemon prio=10 tid=0x00007f3492b30800 nid=0x6875 waiting for monitor entry [0x0000000048fcb000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor95" daemon prio=10 tid=0x00007f3493b4c000 nid=0x6874 waiting for monitor entry [0x0000000048eca000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor94" daemon prio=10 tid=0x00007f3493b4a000 nid=0x6873 waiting for monitor entry [0x0000000048dc9000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor93" daemon prio=10 tid=0x00007f3493b48000 nid=0x6872 waiting for monitor entry [0x0000000048cc8000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor92" daemon prio=10 tid=0x00007f3493b46800 nid=0x6866 waiting for monitor entry [0x0000000048bc7000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor91" daemon prio=10 tid=0x00007f349087d800 nid=0x6865 waiting for monitor entry [0x0000000048ac6000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor90" daemon prio=10 tid=0x00007f349087b800 nid=0x6864 waiting for monitor entry [0x00000000489c5000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor89" daemon prio=10 tid=0x00007f349087a000 nid=0x6863 waiting for monitor entry [0x00000000488c4000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor88" daemon prio=10 tid=0x00007f3490878800 nid=0x685a waiting for monitor entry [0x0000000046fab000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor87" daemon prio=10 tid=0x00007f3490877000 nid=0x6859 waiting for monitor entry [0x00000000483bf000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor86" daemon prio=10 tid=0x00007f3492492800 nid=0x6858 waiting for monitor entry [0x0000000045d99000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor85" daemon prio=10 tid=0x00007f3492491800 nid=0x6857 waiting for monitor entry [0x00000000477b3000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor84" daemon prio=10 tid=0x00007f3492490000 nid=0x6855 waiting for monitor entry [0x0000000047ab6000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor83" daemon prio=10 tid=0x00007f349248e800 nid=0x6854 waiting for monitor entry [0x0000000047cb8000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor82" daemon prio=10 tid=0x00007f349248d000 nid=0x6853 waiting for monitor entry [0x0000000047db9000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor81" daemon prio=10 tid=0x00007f349248c800 nid=0x6852 waiting for monitor entry [0x0000000047bb7000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor80" daemon prio=10 tid=0x00007f34917f5800 nid=0x6831 waiting for monitor entry [0x00000000480bc000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor79" daemon prio=10 tid=0x00007f34917f4800 nid=0x6830 waiting for monitor entry [0x00000000487c3000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor78" daemon prio=10 tid=0x00007f3493ab1000 nid=0x682f waiting for monitor entry [0x0000000046da9000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor77" daemon prio=10 tid=0x00007f3493aaf800 nid=0x682e waiting for monitor entry [0x00000000475b1000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor76" daemon prio=10 tid=0x00007f34931f0000 nid=0x6826 waiting for monitor entry [0x00000000474b0000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor75" daemon prio=10 tid=0x00007f34931ee800 nid=0x6825 waiting for monitor entry [0x00000000466a2000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor74" daemon prio=10 tid=0x00007f34904fe800 nid=0x6824 waiting for monitor entry [0x00000000469a5000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor73" daemon prio=10 tid=0x00007f34904fd000 nid=0x6823 waiting for monitor entry [0x00000000468a4000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor72" daemon prio=10 tid=0x00007f3490098800 nid=0x680e waiting for monitor entry [0x0000000047eba000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor71" daemon prio=10 tid=0x00007f3490097000 nid=0x680d waiting for monitor entry [0x00000000478b4000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor70" daemon prio=10 tid=0x00007f3490016800 nid=0x680c waiting for monitor entry [0x00000000479b5000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor69" daemon prio=10 tid=0x00007f3490015000 nid=0x680b waiting for monitor entry [0x0000000046aa6000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor68" daemon prio=10 tid=0x00007f349159f000 nid=0x6806 waiting for monitor entry [0x00000000470ac000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor67" daemon prio=10 tid=0x00007f349159d800 nid=0x6805 waiting for monitor entry [0x00000000471ad000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor66" daemon prio=10 tid=0x00007f3492424000 nid=0x6804 waiting for monitor entry [0x00000000482be000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor65" daemon prio=10 tid=0x00007f3492423000 nid=0x6803 waiting for monitor entry [0x0000000047fbb000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor64" daemon prio=10 tid=0x00007f3492422800 nid=0x67fe waiting for monitor entry [0x00000000484c0000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor63" daemon prio=10 tid=0x00007f3490102000 nid=0x67fd waiting for monitor entry [0x00000000486c2000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor62" daemon prio=10 tid=0x00007f3490101800 nid=0x67fc waiting for monitor entry [0x00000000467a3000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor61" daemon prio=10 tid=0x00007f3490100800 nid=0x67fb waiting for monitor entry [0x0000000046ca8000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor60" daemon prio=10 tid=0x00007f3491566800 nid=0x67f8 waiting for monitor entry [0x00000000473af000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor59" daemon prio=10 tid=0x00007f3491565800 nid=0x67f7 waiting for monitor entry [0x00000000476b2000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor58" daemon prio=10 tid=0x00007f3491565000 nid=0x67f6 waiting for monitor entry [0x00000000472ae000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor57" daemon prio=10 tid=0x00007f34900de000 nid=0x67f5 waiting for monitor entry [0x00000000485c1000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "RMI TCP Connection(746)-10.2.16.18" daemon prio=10 tid=0x00007f349d14f000 nid=0x4989 runnable [0x00000000481bd000] java.lang.Thread.State: RUNNABLE at java.net.SocketInputStream.socketRead0(Native Method) at java.net.SocketInputStream.read(SocketInputStream.java:129) at com.mysql.jdbc.util.ReadAheadInputStream.fill(ReadAheadInputStream.java:113) at com.mysql.jdbc.util.ReadAheadInputStream.readFromUnderlyingStreamIfNecessary(ReadAheadInputStream.java:160) at com.mysql.jdbc.util.ReadAheadInputStream.read(ReadAheadInputStream.java:188) - locked <0x00007f34a541d3e0> (a com.mysql.jdbc.util.ReadAheadInputStream) at com.mysql.jdbc.MysqlIO.readFully(MysqlIO.java:1994) at com.mysql.jdbc.MysqlIO.reuseAndReadPacket(MysqlIO.java:2411) at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:2916) at com.mysql.jdbc.MysqlIO.sendCommand(MysqlIO.java:1631) at com.mysql.jdbc.MysqlIO.sqlQueryDirect(MysqlIO.java:1723) at com.mysql.jdbc.Connection.execSQL(Connection.java:3283) - locked <0x00007f34a541d798> (a java.lang.Object) at com.mysql.jdbc.PreparedStatement.executeInternal(PreparedStatement.java:1332) at com.mysql.jdbc.PreparedStatement.execute(PreparedStatement.java:882) - locked <0x00007f34a541d798> (a java.lang.Object) at org.apache.tomcat.dbcp.dbcp.DelegatingPreparedStatement.execute(DelegatingPreparedStatement.java:169) at org.apache.jackrabbit.core.persistence.bundle.util.ConnectionRecoveryManager.executeStmtInternal(ConnectionRecoveryManager.java:371) at org.apache.jackrabbit.core.persistence.bundle.util.ConnectionRecoveryManager.executeStmtInternal(ConnectionRecoveryManager.java:298) at org.apache.jackrabbit.core.persistence.bundle.util.ConnectionRecoveryManager.executeStmt(ConnectionRecoveryManager.java:261) - locked <0x00007f34a53d7c70> (a org.apache.jackrabbit.core.persistence.bundle.util.ConnectionRecoveryManager) at org.apache.jackrabbit.core.persistence.bundle.util.ConnectionRecoveryManager.executeStmt(ConnectionRecoveryManager.java:239) at org.apache.jackrabbit.core.persistence.bundle.BundleDbPersistenceManager.storeBundle(BundleDbPersistenceManager.java:1329) - locked <0x00007f34a539d8b0> (a org.hippoecm.repository.jackrabbit.persistence.ForkedMySqlPersistenceManager) at org.apache.jackrabbit.core.persistence.bundle.AbstractBundlePersistenceManager.putBundle(AbstractBundlePersistenceManager.java:732) at org.apache.jackrabbit.core.persistence.bundle.AbstractBundlePersistenceManager.storeInternal(AbstractBundlePersistenceManager.java:672) at org.apache.jackrabbit.core.persistence.bundle.AbstractBundlePersistenceManager.store(AbstractBundlePersistenceManager.java:536) - locked <0x00007f34a539d8b0> (a org.hippoecm.repository.jackrabbit.persistence.ForkedMySqlPersistenceManager) at org.apache.jackrabbit.core.persistence.bundle.BundleDbPersistenceManager.store(BundleDbPersistenceManager.java:526) - locked <0x00007f34a539d8b0> (a org.hippoecm.repository.jackrabbit.persistence.ForkedMySqlPersistenceManager) at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.end(SharedItemStateManager.java:724) at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) - locked <0x00007f34d38fba78> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) at org.apache.jackrabbit.core.NodeImpl.checkout(NodeImpl.java:3340) at org.hippoecm.repository.decorating.NodeDecorator.checkout(NodeDecorator.java:387) at org.hippoecm.repository.impl.NodeDecorator.checkout(NodeDecorator.java:173) at org.hippoecm.repository.impl.DocumentManagerImpl.putObject(DocumentManagerImpl.java:142) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:498) - locked <0x00007f34d38fba78> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at $Proxy6.obtainEditableInstance(Unknown Source) at sun.reflect.GeneratedMethodAccessor45.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at sun.rmi.server.UnicastServerRef.dispatch(UnicastServerRef.java:305) at sun.rmi.transport.Transport$1.run(Transport.java:159) at java.security.AccessController.doPrivileged(Native Method) at sun.rmi.transport.Transport.serviceCall(Transport.java:155) at sun.rmi.transport.tcp.TCPTransport.handleMessages(TCPTransport.java:535) at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(TCPTransport.java:790) at sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(TCPTransport.java:649) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.18-8444-3" daemon prio=10 tid=0x00007f349d085800 nid=0x640b in Object.wait() [0x0000000046ba8000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007f34c9442628> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.18-8444-2" daemon prio=10 tid=0x00007f349d14f800 nid=0x640a in Object.wait() [0x0000000046eab000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007f34c9442938> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "TP-Processor56" daemon prio=10 tid=0x00007f3490678000 nid=0x3bb9 waiting for monitor entry [0x00000000465a1000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor55" daemon prio=10 tid=0x00007f3490676000 nid=0x3bb8 waiting for monitor entry [0x00000000464a0000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor54" daemon prio=10 tid=0x00007f3490675800 nid=0x3bb7 waiting for monitor entry [0x000000004639f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor53" daemon prio=10 tid=0x00007f3490675000 nid=0x3bb6 waiting for monitor entry [0x000000004629e000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor52" daemon prio=10 tid=0x00007f3490674000 nid=0x3b95 waiting for monitor entry [0x000000004619d000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor51" daemon prio=10 tid=0x00007f3492267800 nid=0x3b94 waiting for monitor entry [0x000000004609c000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor50" daemon prio=10 tid=0x00007f3492266800 nid=0x3b93 waiting for monitor entry [0x0000000045f9b000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor49" daemon prio=10 tid=0x00007f3492266000 nid=0x3b92 waiting for monitor entry [0x0000000045e9a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor48" daemon prio=10 tid=0x00007f3492264000 nid=0x3b8e waiting for monitor entry [0x0000000045c98000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor47" daemon prio=10 tid=0x00007f3493bc1000 nid=0x3b8d waiting for monitor entry [0x0000000045b97000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor46" daemon prio=10 tid=0x00007f3493bc0800 nid=0x3b8c waiting for monitor entry [0x0000000045a96000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor45" daemon prio=10 tid=0x00007f3493bc0000 nid=0x3b8b waiting for monitor entry [0x0000000045995000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor44" daemon prio=10 tid=0x00007f3493bbe000 nid=0x3b87 waiting for monitor entry [0x0000000045894000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor43" daemon prio=10 tid=0x00007f3493bbd800 nid=0x3b86 waiting for monitor entry [0x0000000045793000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor42" daemon prio=10 tid=0x00007f349333f800 nid=0x3b85 waiting for monitor entry [0x0000000045692000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor41" daemon prio=10 tid=0x00007f349333e800 nid=0x3b84 waiting for monitor entry [0x0000000045591000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor40" daemon prio=10 tid=0x00007f3490506800 nid=0x3b68 waiting for monitor entry [0x0000000045490000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor39" daemon prio=10 tid=0x00007f3490505000 nid=0x3b67 waiting for monitor entry [0x000000004538f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor38" daemon prio=10 tid=0x00007f3490106800 nid=0x3b66 waiting for monitor entry [0x000000004528e000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor37" daemon prio=10 tid=0x00007f3490106000 nid=0x3b65 waiting for monitor entry [0x000000004518d000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor36" daemon prio=10 tid=0x00007f349049b800 nid=0x3b64 waiting for monitor entry [0x000000004508c000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor35" daemon prio=10 tid=0x00007f349049b000 nid=0x3b63 waiting for monitor entry [0x0000000044f8b000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor34" daemon prio=10 tid=0x00007f349049a800 nid=0x3b62 waiting for monitor entry [0x000000004437f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor33" daemon prio=10 tid=0x00007f3491ef6800 nid=0x3b61 waiting for monitor entry [0x0000000044b87000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor32" daemon prio=10 tid=0x00007f3491ef5800 nid=0x3b5f waiting for monitor entry [0x0000000044a86000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor31" daemon prio=10 tid=0x00007f3491a79000 nid=0x3b5e waiting for monitor entry [0x0000000043e7a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor30" daemon prio=10 tid=0x00007f3493b8e800 nid=0x3b5d waiting for monitor entry [0x0000000044480000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor29" daemon prio=10 tid=0x00007f34924b2000 nid=0x3b5c waiting for monitor entry [0x0000000043b77000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor28" daemon prio=10 tid=0x00007f348828e800 nid=0x3b3f waiting for monitor entry [0x0000000044985000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor27" daemon prio=10 tid=0x00007f3493440000 nid=0x3b3e waiting for monitor entry [0x0000000044d89000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor26" daemon prio=10 tid=0x00007f34932b3800 nid=0x3b3d waiting for monitor entry [0x0000000044682000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor25" daemon prio=10 tid=0x00007f34915cd800 nid=0x3b3c waiting for monitor entry [0x0000000043a76000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor24" daemon prio=10 tid=0x00007f34932de800 nid=0x3b3b waiting for monitor entry [0x0000000044c88000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor23" daemon prio=10 tid=0x00007f3491688000 nid=0x3b3a waiting for monitor entry [0x0000000044783000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor22" daemon prio=10 tid=0x00007f34927df800 nid=0x3b39 waiting for monitor entry [0x0000000043975000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor21" daemon prio=10 tid=0x00007f3490123800 nid=0x3b38 waiting for monitor entry [0x0000000044e8a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "Java2D Disposer" daemon prio=10 tid=0x00007f3494dfc800 nid=0x1ab7 in Object.wait() [0x0000000044885000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) - waiting on <0x00007f34b64406a0> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) - locked <0x00007f34b64406a0> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) at sun.java2d.Disposer.run(Disposer.java:125) at java.lang.Thread.run(Thread.java:619) "File Reaper" daemon prio=10 tid=0x00007f349c57d800 nid=0x1aae in Object.wait() [0x0000000044582000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) - waiting on <0x00007f34b6414f40> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) - locked <0x00007f34b6414f40> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) at org.apache.wicket.util.file.FileCleaner$1.run(FileCleaner.java:64) "TP-Processor20" daemon prio=10 tid=0x00007f3490630000 nid=0x7fbd waiting for monitor entry [0x000000004417d000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor19" daemon prio=10 tid=0x00007f3491c9e800 nid=0x7fbc waiting for monitor entry [0x0000000043c78000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor18" daemon prio=10 tid=0x00007f3493ab2800 nid=0x7fbb waiting for monitor entry [0x000000004427e000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor17" daemon prio=10 tid=0x00007f3492428000 nid=0x7fba waiting for monitor entry [0x000000004407c000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor16" daemon prio=10 tid=0x00007f34921d2000 nid=0x7d0e waiting for monitor entry [0x0000000043773000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.persistence.bundle.AbstractBundlePersistenceManager.exists(AbstractBundlePersistenceManager.java:506) - waiting to lock <0x00007f34a539d8b0> (a org.hippoecm.repository.jackrabbit.persistence.ForkedMySqlPersistenceManager) at org.apache.jackrabbit.core.state.SharedItemStateManager.hasNonVirtualItemState(SharedItemStateManager.java:1352) at org.apache.jackrabbit.core.state.SharedItemStateManager.hasItemState(SharedItemStateManager.java:297) at org.apache.jackrabbit.core.state.LocalItemStateManager.hasItemState(LocalItemStateManager.java:202) at org.apache.jackrabbit.core.state.SessionItemStateManager.getItemState(SessionItemStateManager.java:181) at org.apache.jackrabbit.core.ItemManager.getItemData(ItemManager.java:282) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:228) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - locked <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor15" daemon prio=10 tid=0x00007f349217e800 nid=0x7d0d waiting for monitor entry [0x0000000043d79000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor14" daemon prio=10 tid=0x00007f34904f3000 nid=0x7d0c waiting for monitor entry [0x0000000043f7b000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor13" daemon prio=10 tid=0x00007f3491aab800 nid=0x7d0b waiting for monitor entry [0x0000000043874000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor12" daemon prio=10 tid=0x00007f3490b29000 nid=0x6b58 waiting for monitor entry [0x0000000043672000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor11" daemon prio=10 tid=0x00007f34918fc000 nid=0x6b57 waiting for monitor entry [0x0000000043571000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor10" daemon prio=10 tid=0x00007f349e40a800 nid=0x6b56 waiting for monitor entry [0x0000000043470000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor9" daemon prio=10 tid=0x00007f349e40a000 nid=0x6b55 waiting for monitor entry [0x000000004336f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor8" daemon prio=10 tid=0x00007f349d010000 nid=0x6b3e waiting for monitor entry [0x000000004326e000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor7" daemon prio=10 tid=0x00007f349cfa0800 nid=0x6b3d waiting for monitor entry [0x000000004316d000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor6" daemon prio=10 tid=0x00007f349cb30000 nid=0x6b3c waiting for monitor entry [0x000000004306c000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor5" daemon prio=10 tid=0x00007f349d212000 nid=0x6b3b waiting for monitor entry [0x0000000042e6a000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "RMI Scheduler(0)" daemon prio=10 tid=0x00007f349d1cc800 nid=0x6b22 waiting on condition [0x0000000042f6c000] java.lang.Thread.State: TIMED_WAITING (parking) at sun.misc.Unsafe.park(Native Method) - parking to wait for <0x00007f34ab141740> (a java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject) at java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:198) at java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.awaitNanos(AbstractQueuedSynchronizer.java:1963) at java.util.concurrent.DelayQueue.take(DelayQueue.java:164) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(ScheduledThreadPoolExecutor.java:583) at java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue.take(ScheduledThreadPoolExecutor.java:576) at java.util.concurrent.ThreadPoolExecutor.getTask(ThreadPoolExecutor.java:947) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:907) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.18-8444-1" daemon prio=10 tid=0x00007f349dc1a000 nid=0x6b20 in Object.wait() [0x0000000042d6a000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) - locked <0x00007f34ab1c4570> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) at java.lang.Thread.run(Thread.java:619) "http-10.2.16.18-8444-Acceptor-0" daemon prio=10 tid=0x00007f3490267000 nid=0x6b1f runnable [0x0000000042c69000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007f34a4bfdb78> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) at java.lang.Thread.run(Thread.java:619) "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007f349009c000 nid=0x6b1e waiting on condition [0x0000000042b68000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) at java.lang.Thread.run(Thread.java:619) "TP-Monitor" daemon prio=10 tid=0x00007f349df2b800 nid=0x6b1d in Object.wait() [0x0000000042a67000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(Native Method) at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) - locked <0x00007f34ab1c6810> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) at java.lang.Thread.run(Thread.java:619) "TP-Processor4" daemon prio=10 tid=0x00007f349e4e6800 nid=0x6b1c in Object.wait() [0x0000000042966000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.tomcat.util.threads.ThreadPool.findControlRunnable(ThreadPool.java:339) - locked <0x00007f34ab1c40a0> (a org.apache.tomcat.util.threads.ThreadPool) at org.apache.tomcat.util.threads.ThreadPool.runIt(ThreadPool.java:314) at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:669) at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor3" daemon prio=10 tid=0x00007f349d14d000 nid=0x6b1b waiting for monitor entry [0x0000000042864000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor2" daemon prio=10 tid=0x00007f349e343800 nid=0x6b1a waiting for monitor entry [0x000000004235f000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "TP-Processor1" daemon prio=10 tid=0x00007f349dc01000 nid=0x6b19 waiting for monitor entry [0x00000000414f8000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.ItemManager.getItem(ItemManager.java:493) - waiting to lock <0x00007f34a5f7b7a8> (a org.apache.jackrabbit.core.ItemManager) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.fetchNext(QueryResultImpl.java:573) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.initialize(QueryResultImpl.java:532) at org.apache.jackrabbit.core.query.lucene.QueryResultImpl$LazyScoreNodeIterator.hasNext(QueryResultImpl.java:516) at org.hippoecm.repository.security.SecurityManager.getDomainsForGroup(SecurityManager.java:355) at org.hippoecm.repository.security.HippoLoginModule.setFacetAuthPrincipals(HippoLoginModule.java:304) at org.hippoecm.repository.security.HippoLoginModule.login(HippoLoginModule.java:176) at org.apache.jackrabbit.core.security.authentication.LocalAuthContext.login(LocalAuthContext.java:72) at org.apache.jackrabbit.core.RepositoryImpl.login(RepositoryImpl.java:1356) at org.hippoecm.repository.jackrabbit.RepositoryImpl.login(RepositoryImpl.java:307) at org.hippoecm.repository.impl.RepositoryDecorator.login(RepositoryDecorator.java:84) at org.hippoecm.repository.decorating.checked.RepositoryDecorator.login(RepositoryDecorator.java:77) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:113) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:126) at org.hippoecm.repository.HippoRepositoryImpl.login(HippoRepositoryImpl.java:103) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:127) at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:46) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.session.UserSession.getJcrSessionInternal(UserSession.java:160) at org.hippoecm.frontend.session.UserSession.getJcrSession(UserSession.java:148) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:141) at org.hippoecm.frontend.model.JcrItemModel.load(JcrItemModel.java:43) at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) at org.hippoecm.frontend.model.JcrNodeModel.getNode(JcrNodeModel.java:70) at org.hippoecm.frontend.plugin.config.impl.JcrApplicationFactory.getApplication(JcrApplicationFactory.java:58) at org.hippoecm.frontend.plugin.config.impl.PluginConfigFactory.(PluginConfigFactory.java:55) at org.hippoecm.frontend.Home.(Home.java:79) at org.hippoecm.frontend.Home.(Home.java:66) at sun.reflect.GeneratedConstructorAccessor25.newInstance(Unknown Source) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27) at java.lang.reflect.Constructor.newInstance(Constructor.java:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) at java.lang.Thread.run(Thread.java:619) "http-8080-Acceptor-0" daemon prio=10 tid=0x00007f349e412000 nid=0x6b18 waiting on condition [0x000000004036b000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:309) at java.lang.Thread.run(Thread.java:619) "RMI TCP Accept-1099" daemon prio=10 tid=0x00007f34915fd800 nid=0x6b16 runnable [0x0000000042461000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007f34ab0f0ac0> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) at java.lang.Thread.run(Thread.java:619) "GC Daemon" daemon prio=10 tid=0x00007f34915fd000 nid=0x6b15 in Object.wait() [0x000000004190a000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(Native Method) at sun.misc.GC$Daemon.run(GC.java:100) - locked <0x00007f34ab149710> (a sun.misc.GC$LatencyLock) "RMI Reaper" prio=10 tid=0x00007f34908af800 nid=0x6b14 in Object.wait() [0x000000004225f000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) - locked <0x00007f34aabcacd8> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) at java.lang.Thread.run(Thread.java:619) "RMI TCP Accept-0" daemon prio=10 tid=0x00007f34904a6000 nid=0x6b13 runnable [0x00000000415fa000] java.lang.Thread.State: RUNNABLE at java.net.PlainSocketImpl.socketAccept(Native Method) at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) - locked <0x00007f34aab93088> (a java.net.SocksSocketImpl) at java.net.ServerSocket.implAccept(ServerSocket.java:453) at java.net.ServerSocket.accept(ServerSocket.java:421) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) at java.lang.Thread.run(Thread.java:619) "ClusterNode-s1718" daemon prio=10 tid=0x00007f3490455800 nid=0x6ac8 in Object.wait() [0x0000000042562000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) - locked <0x00007f34a539dfd0> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) at java.lang.Thread.run(Thread.java:619) "IndexMerger" daemon prio=10 tid=0x00007f3490018000 nid=0x6a9b in Object.wait() [0x00000000411c4000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) - locked <0x00007f34a8db52f8> (a org.apache.commons.collections.buffer.BlockingBuffer) at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) "Timer-0" daemon prio=10 tid=0x00007f3490001000 nid=0x6a92 in Object.wait() [0x00000000413f8000] java.lang.Thread.State: TIMED_WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.util.TimerThread.mainLoop(Timer.java:509) - locked <0x00007f34a8db1ab8> (a java.util.TaskQueue) at java.util.TimerThread.run(Timer.java:462) "IndexMerger" daemon prio=10 tid=0x00007f349dae2000 nid=0x6a91 in Object.wait() [0x000000004215e000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) - locked <0x00007f34a5ffbc70> (a org.apache.commons.collections.buffer.BlockingBuffer) at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) "ObservationManager" daemon prio=10 tid=0x00007f349d6e2000 nid=0x6a8f in Object.wait() [0x00000000412f7000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) - locked <0x00007f34a5c05638> (a org.apache.commons.collections.buffer.BlockingBuffer) at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) at java.lang.Thread.run(Thread.java:619) "Transient File Reaper" daemon prio=10 tid=0x00007f349dfea000 nid=0x6a8e in Object.wait() [0x0000000040cbd000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) - waiting on <0x00007f34a52bc890> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) - locked <0x00007f34a52bc890> (a java.lang.ref.ReferenceQueue$Lock) at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007f349dee8000 nid=0x6a8d in Object.wait() [0x00000000410c3000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) - waiting on <0x00007f34a504ff08> (a java.util.TaskQueue) at java.lang.Object.wait(Object.java:485) at java.util.TimerThread.mainLoop(Timer.java:483) - locked <0x00007f34a504ff08> (a java.util.TaskQueue) at java.util.TimerThread.run(Timer.java:462) "Low Memory Detector" daemon prio=10 tid=0x00007f3498006000 nid=0x6a84 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE "CompilerThread1" daemon prio=10 tid=0x00007f3498003000 nid=0x6a83 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE "CompilerThread0" daemon prio=10 tid=0x00007f3498001000 nid=0x6a82 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE "Signal Dispatcher" daemon prio=10 tid=0x00007f349e4d2800 nid=0x6a81 waiting on condition [0x0000000000000000] java.lang.Thread.State: RUNNABLE "Finalizer" daemon prio=10 tid=0x00007f349e75d800 nid=0x6a80 waiting for monitor entry [0x0000000040aac000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.jackrabbit.core.persistence.bundle.AbstractBundlePersistenceManager.exists(AbstractBundlePersistenceManager.java:495) - waiting to lock <0x00007f34a539d8b0> (a org.hippoecm.repository.jackrabbit.persistence.ForkedMySqlPersistenceManager) at org.apache.jackrabbit.core.state.SharedItemStateManager.hasNonVirtualItemState(SharedItemStateManager.java:1354) at org.apache.jackrabbit.core.state.SharedItemStateManager.hasItemState(SharedItemStateManager.java:297) at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.hasItemState(ForkedXAItemStateManager.java:308) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.hasItemState(HippoLocalItemStateManager.java:309) at org.apache.jackrabbit.core.CachingHierarchyManager.stateDiscarded(CachingHierarchyManager.java:350) at org.apache.jackrabbit.core.state.StateChangeDispatcher.notifyStateDiscarded(StateChangeDispatcher.java:141) at org.apache.jackrabbit.core.state.LocalItemStateManager.dispose(LocalItemStateManager.java:367) at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.dispose(HippoLocalItemStateManager.java:209) at org.hippoecm.repository.jackrabbit.HippoSessionItemStateManager.dispose(HippoSessionItemStateManager.java:78) at org.apache.jackrabbit.core.SessionImpl.logout(SessionImpl.java:1160) - locked <0x00007f34d2ecf270> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at org.apache.jackrabbit.core.ForkedXASessionImpl.logout(ForkedXASessionImpl.java:405) - locked <0x00007f34d2ecf270> (a org.hippoecm.repository.jackrabbit.XASessionImpl) at org.hippoecm.repository.jackrabbit.XASessionImpl.logout(XASessionImpl.java:150) at org.hippoecm.repository.jackrabbit.XASessionImpl.finalize(XASessionImpl.java:221) at java.lang.ref.Finalizer.invokeFinalizeMethod(Native Method) at java.lang.ref.Finalizer.runFinalizer(Finalizer.java:83) at java.lang.ref.Finalizer.access$100(Finalizer.java:14) at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:160) "Reference Handler" daemon prio=10 tid=0x00007f349e756000 nid=0x6a7f in Object.wait() [0x000000004098c000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) - locked <0x00007f34a4c39510> (a java.lang.ref.Reference$Lock) "main" prio=10 tid=0x0000000040113800 nid=0x6a74 in Object.wait() [0x00000000404a2000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(Native Method) at java.lang.Object.wait(Object.java:485) at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) - locked <0x00007f34a4fad1c0> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) at org.apache.jackrabbit.core.RepositoryImpl.shutdown(RepositoryImpl.java:1051) at org.hippoecm.repository.jackrabbit.RepositoryImpl.shutdown(RepositoryImpl.java:355) at org.hippoecm.repository.LocalHippoRepository.close(LocalHippoRepository.java:956) - locked <0x00007f34a4d47df8> (a org.hippoecm.repository.LocalHippoRepository) at org.hippoecm.frontend.Main.onDestroy(Main.java:321) at org.apache.wicket.Application.internalDestroy(Application.java:956) at org.apache.wicket.protocol.http.WebApplication.internalDestroy(WebApplication.java:529) at org.apache.wicket.protocol.http.WicketFilter.destroy(WicketFilter.java:176) at org.apache.wicket.protocol.http.WicketServlet.destroy(WicketServlet.java:268) at org.apache.catalina.core.StandardWrapper.unload(StandardWrapper.java:1394) - locked <0x00007f34a4d0e6d8> (a org.apache.catalina.core.StandardWrapper) at org.apache.catalina.core.StandardWrapper.stop(StandardWrapper.java:1739) at org.apache.catalina.core.StandardContext.stop(StandardContext.java:4563) - locked <0x00007f34a4c89f20> (a org.apache.catalina.core.StandardContext) at org.apache.catalina.core.ContainerBase.removeChild(ContainerBase.java:924) at org.apache.catalina.startup.HostConfig.undeployApps(HostConfig.java:1248) at org.apache.catalina.startup.HostConfig.stop(HostConfig.java:1219) at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:316) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.core.ContainerBase.stop(ContainerBase.java:1086) - locked <0x00007f34a4c691c8> (a org.apache.catalina.core.StandardHost) at org.apache.catalina.core.ContainerBase.stop(ContainerBase.java:1098) - locked <0x00007f34a4c68f98> (a org.apache.catalina.core.StandardEngine) at org.apache.catalina.core.StandardEngine.stop(StandardEngine.java:448) at org.apache.catalina.core.StandardService.stop(StandardService.java:584) - locked <0x00007f34a4c68f98> (a org.apache.catalina.core.StandardEngine) at org.apache.catalina.core.StandardServer.stop(StandardServer.java:744) at org.apache.catalina.startup.Catalina.stop(Catalina.java:633) at org.apache.catalina.startup.Catalina.start(Catalina.java:608) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) "VM Thread" prio=10 tid=0x00007f349e74f000 nid=0x6a7e runnable "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x6a76 runnable "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x6a77 runnable "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121000 nid=0x6a78 runnable "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x6a79 runnable "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x6a7a runnable "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040126800 nid=0x6a7b runnable "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x6a7c runnable "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x6a7d runnable "VM Periodic Task Thread" prio=10 tid=0x00007f3498009000 nid=0x6a85 waiting on condition JNI global references: 1037 Heap PSYoungGen total 1105728K, used 307282K [0x00007f354f5b0000, 0x00007f359d190000, 0x00007f35a4b00000) eden space 950208K, 32% used [0x00007f354f5b0000,0x00007f35621c4b90,0x00007f35895a0000) from space 155520K, 0% used [0x00007f3593190000,0x00007f3593190000,0x00007f359c970000) to space 159680K, 0% used [0x00007f35895a0000,0x00007f35895a0000,0x00007f3593190000) PSOldGen total 2073408K, used 997055K [0x00007f34a4b00000, 0x00007f35233d0000, 0x00007f354f5b0000) object space 2073408K, 48% used [0x00007f34a4b00000,0x00007f34e18afe50,0x00007f35233d0000) PSPermGen total 57408K, used 57027K [0x00007f349f700000, 0x00007f34a2f10000, 0x00007f34a4b00000) object space 57408K, 99% used [0x00007f349f700000,0x00007f34a2eb0c88,0x00007f34a2f10000) > Deadlock in version storage - VersionManagerImpl > ------------------------------------------------ > > Key: HREPTWO-3978 > URL: http://issues.onehippo.com/browse/HREPTWO-3978 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jettro Coenradie > Assignee: Berry van Halderen > Priority: Top > Fix For: r2.12.08, r2.13.00 > > > During concurrent cms usage we encountered a deadlock situation. The following output was obtained using a kill -3 on the tomcat server > "TP-Processor5" daemon prio=10 tid=0x00007ff076f43000 nid=0x48a3 waiting for monitor entry [0x000000004354a000] > java.lang.Thread.State: BLOCKED (on object monitor) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:565) > - waiting to lock <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff09b34eb80> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:232) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:161) > at sun.reflect.GeneratedMethodAccessor89.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff09b44a230> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy6.add(Unknown Source) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:263) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:237) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.onOk(CompatibilityWorkflowPlugin.java:200) > at org.hippoecm.frontend.dialog.AbstractDialog.handleSubmit(AbstractDialog.java:526) > at org.hippoecm.frontend.dialog.AbstractDialog$2.onSubmit(AbstractDialog.java:395) > at org.hippoecm.frontend.dialog.AbstractDialog$ButtonWrapper$1.onSubmit(AbstractDialog.java:265) > at org.apache.wicket.ajax.markup.html.form.AjaxButton$1.onSubmit(AjaxButton.java:102) > at org.apache.wicket.ajax.form.AjaxFormSubmitBehavior.onEvent(AjaxFormSubmitBehavior.java:143) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-50" daemon prio=10 tid=0x00007ff068245000 nid=0x4635 in Object.wait() [0x0000000047188000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d94a8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-49" daemon prio=10 tid=0x00007ff068c37000 nid=0x4634 in Object.wait() [0x0000000047087000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d67b0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-48" daemon prio=10 tid=0x00007ff068c35000 nid=0x4633 in Object.wait() [0x0000000046f86000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9850> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-47" daemon prio=10 tid=0x00007ff068ceb800 nid=0x4632 in Object.wait() [0x0000000046e85000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6af8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-46" daemon prio=10 tid=0x00007ff068cea000 nid=0x4631 in Object.wait() [0x0000000046d84000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6eb0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-45" daemon prio=10 tid=0x00007ff068dcc000 nid=0x4630 in Object.wait() [0x0000000046c83000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9c08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-44" daemon prio=10 tid=0x00007ff0683ee000 nid=0x462f in Object.wait() [0x0000000046b82000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9e28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-43" daemon prio=10 tid=0x00007ff0683ec000 nid=0x462e in Object.wait() [0x0000000046a81000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-42" daemon prio=10 tid=0x00007ff068c04800 nid=0x462d in Object.wait() [0x0000000046980000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e04c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-41" daemon prio=10 tid=0x00007ff068ab5800 nid=0x462c in Object.wait() [0x000000004687f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e27f0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-40" daemon prio=10 tid=0x00007ff068ab3800 nid=0x462b in Object.wait() [0x000000004677e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-39" daemon prio=10 tid=0x00007ff068dc9000 nid=0x462a in Object.wait() [0x000000004667d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2b38> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-38" daemon prio=10 tid=0x00007ff0699b2800 nid=0x4629 in Object.wait() [0x000000004657c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2d58> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-37" daemon prio=10 tid=0x00007ff068c38800 nid=0x4628 in Object.wait() [0x000000004647b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0bc0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-36" daemon prio=10 tid=0x00007ff069a98800 nid=0x4627 in Object.wait() [0x000000004637a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e30a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-35" daemon prio=10 tid=0x00007ff0680a7000 nid=0x4626 in Object.wait() [0x0000000046279000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-34" daemon prio=10 tid=0x00007ff068ce8800 nid=0x4625 in Object.wait() [0x0000000046178000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3458> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-33" daemon prio=10 tid=0x00007ff06951e800 nid=0x4624 in Object.wait() [0x0000000046077000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1250> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-32" daemon prio=10 tid=0x00007ff06d6f6000 nid=0x4623 in Object.wait() [0x0000000045f76000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e37d8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-31" daemon prio=10 tid=0x00007ff06d6f4000 nid=0x4622 in Object.wait() [0x0000000045e75000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1608> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-30" daemon prio=10 tid=0x00007ff06c1a9000 nid=0x4621 in Object.wait() [0x0000000045d74000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3b20> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-29" daemon prio=10 tid=0x00007ff06c1a7000 nid=0x4620 in Object.wait() [0x0000000045c73000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374def8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-28" daemon prio=10 tid=0x00007ff06c1a5000 nid=0x461f in Object.wait() [0x0000000045b72000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e240> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-27" daemon prio=10 tid=0x00007ff06c1a3000 nid=0x461e in Object.wait() [0x0000000045a71000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e588> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-26" daemon prio=10 tid=0x00007ff06c1a2800 nid=0x461d in Object.wait() [0x0000000045970000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e940> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-25" daemon prio=10 tid=0x00007ff06c0c0800 nid=0x461c in Object.wait() [0x000000004586f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374eb60> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-24" daemon prio=10 tid=0x00007ff06c0c0000 nid=0x461b in Object.wait() [0x000000004576e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374ee70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-23" daemon prio=10 tid=0x00007ff06d846000 nid=0x461a in Object.wait() [0x000000004566d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f1b8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-22" daemon prio=10 tid=0x00007ff06c3f5800 nid=0x4619 in Object.wait() [0x000000004556c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f500> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-21" daemon prio=10 tid=0x00007ff06c3f3800 nid=0x4618 in Object.wait() [0x000000004546b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e52d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-20" daemon prio=10 tid=0x00007ff06d844800 nid=0x4617 in Object.wait() [0x000000004536a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5618> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-19" daemon prio=10 tid=0x00007ff06d842800 nid=0x4616 in Object.wait() [0x0000000045269000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5960> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-18" daemon prio=10 tid=0x00007ff06d840800 nid=0x4615 in Object.wait() [0x0000000045168000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5d50> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-17" daemon prio=10 tid=0x00007ff06c196800 nid=0x4614 in Object.wait() [0x0000000045067000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-16" daemon prio=10 tid=0x00007ff06c194800 nid=0x4613 in Object.wait() [0x0000000044f66000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1950> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-15" daemon prio=10 tid=0x00007ff06c193000 nid=0x4612 in Object.wait() [0x0000000044e65000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e64c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-14" daemon prio=10 tid=0x00007ff06c191000 nid=0x4611 in Object.wait() [0x0000000044d64000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-13" daemon prio=10 tid=0x00007ff06db01800 nid=0x4610 in Object.wait() [0x0000000044c63000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e81e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-12" daemon prio=10 tid=0x00007ff06daff800 nid=0x460f in Object.wait() [0x0000000044b62000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e85a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-11" daemon prio=10 tid=0x00007ff06dafd800 nid=0x460e in Object.wait() [0x0000000044a61000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e88e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-10" daemon prio=10 tid=0x00007ff06dafc000 nid=0x460d in Object.wait() [0x0000000044960000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8b08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-9" daemon prio=10 tid=0x00007ff06c097000 nid=0x460c in Object.wait() [0x000000004485f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8ef8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-8" daemon prio=10 tid=0x00007ff06c095000 nid=0x460b in Object.wait() [0x000000004475e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6c98> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-7" daemon prio=10 tid=0x00007ff06c093000 nid=0x460a in Object.wait() [0x000000004465d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e9558> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-6" daemon prio=10 tid=0x00007ff06c091000 nid=0x4609 in Object.wait() [0x000000004455c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6d70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-5" daemon prio=10 tid=0x00007ff06c010800 nid=0x4608 in Object.wait() [0x000000004445b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e98a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-4" daemon prio=10 tid=0x00007ff06c00e800 nid=0x4607 in Object.wait() [0x000000004435a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eae28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-3" daemon prio=10 tid=0x00007ff06c015000 nid=0x4606 in Object.wait() [0x0000000044259000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb218> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-2" daemon prio=10 tid=0x00007ff06d7bd000 nid=0x4605 in Object.wait() [0x0000000044158000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb5d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-1" daemon prio=10 tid=0x00007ff06d7bc000 nid=0x4604 in Object.wait() [0x0000000044057000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3e68> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-Acceptor-0" daemon prio=10 tid=0x00007ff06d7b9800 nid=0x4603 runnable [0x0000000043f56000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e2b3660> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007ff06d7af800 nid=0x4602 waiting on condition [0x0000000043e55000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "TP-Monitor" daemon prio=10 tid=0x00007ff06e29c000 nid=0x4601 in Object.wait() [0x0000000043d54000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) > - locked <0x00007ff08372be60> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor4" daemon prio=10 tid=0x00007ff06c293000 nid=0x4600 runnable [0x0000000043c53000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836e14c8> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:307) > at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:661) > at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor3" daemon prio=10 tid=0x00007ff06c0e4000 nid=0x45ff in Object.wait() [0x0000000043b50000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.applyAppender(EventLoggerImpl.java:190) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.logEvent(EventLoggerImpl.java:141) > at sun.reflect.GeneratedMethodAccessor73.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy1.logEvent(Unknown Source) > at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:135) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:143) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor2" daemon prio=10 tid=0x00007ff06c0e8800 nid=0x45fe in Object.wait() [0x0000000043a4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.apache.jackrabbit.core.version.AbstractVersionManager$WriteOperation.save(AbstractVersionManager.java:150) > at org.apache.jackrabbit.core.version.AbstractVersionManager.createVersionHistory(AbstractVersionManager.java:317) > at org.apache.jackrabbit.core.version.VersionManagerImpl$1.run(VersionManagerImpl.java:220) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:567) > - locked <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:499) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy3.obtainEditableInstance(Unknown Source) > at org.hippoecm.frontend.plugins.reviewedactions.FullReviewedActionsWorkflowPlugin$3.execute(FullReviewedActionsWorkflowPlugin.java:137) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) > at org.hippoecm.addon.workflow.MenuAction$1.onClick(MenuAction.java:43) > at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) > at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor1" daemon prio=10 tid=0x00007ff06daa9000 nid=0x45fd in Object.wait() [0x0000000042237000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff0bdd8c778> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.decorating.checked.ItemDecorator.save(ItemDecorator.java:173) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:176) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-8080-Acceptor-0" daemon prio=10 tid=0x00007ff06c0ee000 nid=0x45fc runnable [0x000000004253c000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e28cd70> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x00007ff06c0eb000 nid=0x45fb waiting on condition [0x0000000042e45000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-1099" daemon prio=10 tid=0x00007ff077047800 nid=0x45f7 runnable [0x000000004233a000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff083319458> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "GC Daemon" daemon prio=10 tid=0x00007ff077a11800 nid=0x45f3 in Object.wait() [0x000000004273e000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at sun.misc.GC$Daemon.run(GC.java:100) > - locked <0x00007ff0837e6f90> (a sun.misc.GC$LatencyLock) > "RMI Reaper" prio=10 tid=0x00007ff075853800 nid=0x45f2 in Object.wait() [0x0000000041c4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff0837e71a8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-0" daemon prio=10 tid=0x00007ff077334800 nid=0x45f1 runnable [0x000000004187e000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff08331a5e0> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "HJCRQJS_QuartzSchedulerThread" prio=10 tid=0x00007ff068ce7000 nid=0x45f0 sleeping[0x0000000041b4e000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.quartz.core.QuartzSchedulerThread.run(QuartzSchedulerThread.java:394) > "HJCRQJS_Worker-0" prio=10 tid=0x00007ff068394000 nid=0x45ef in Object.wait() [0x0000000043950000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.quartz.simpl.SimpleThreadPool.getNextRunnable(SimpleThreadPool.java:428) > - locked <0x00007ff082e75448> (a java.lang.Object) > at org.quartz.simpl.SimpleThreadPool.access$000(SimpleThreadPool.java:47) > at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:518) > "RefreshingEventListener" prio=10 tid=0x00007ff068a96000 nid=0x45ee waiting on condition [0x000000004384f000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.hippoecm.repository.RefreshingEventListener$1.run(RefreshingEventListener.java:96) > "ClusterNode-s1720" daemon prio=10 tid=0x00007ff070794800 nid=0x334c in Object.wait() [0x000000004374e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc78> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) > at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) > at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) > at java.lang.Thread.run(Thread.java:619) > "IndexMerger" daemon prio=10 tid=0x00007ff06c05f800 nid=0x7271 in Object.wait() [0x000000004263d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff0813e2858> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "Timer-0" daemon prio=10 tid=0x00007ff06c001000 nid=0x7266 in Object.wait() [0x0000000041594000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.util.TimerThread.mainLoop(Timer.java:509) > - locked <0x00007ff080de49d0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "IndexMerger" daemon prio=10 tid=0x00007ff07794c800 nid=0x7265 in Object.wait() [0x00000000412be000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07f40c0d8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "ObservationManager" daemon prio=10 tid=0x00007ff077076800 nid=0x724d in Object.wait() [0x000000004067f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07eadd8f8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) > at java.lang.Thread.run(Thread.java:619) > "Transient File Reaper" daemon prio=10 tid=0x00007ff07041e800 nid=0x724c in Object.wait() [0x0000000040a39000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) > "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007ff070483000 nid=0x724b in Object.wait() [0x00000000411bd000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.lang.Object.wait(Object.java:485) > at java.util.TimerThread.mainLoop(Timer.java:483) > - locked <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "Low Memory Detector" daemon prio=10 tid=0x00007ff070004000 nid=0x7240 runnable [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread1" daemon prio=10 tid=0x00007ff070001000 nid=0x723f waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread0" daemon prio=10 tid=0x00007ff077aa7800 nid=0x723e waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Signal Dispatcher" daemon prio=10 tid=0x00007ff077aa5800 nid=0x723d waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Finalizer" daemon prio=10 tid=0x00007ff077f29800 nid=0x723a in Object.wait() [0x0000000042138000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e214fe8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159) > "Reference Handler" daemon prio=10 tid=0x00007ff077f22000 nid=0x7239 in Object.wait() [0x0000000040fbb000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) > - locked <0x00007ff07e214fb0> (a java.lang.ref.Reference$Lock) > "main" prio=10 tid=0x0000000040113800 nid=0x722e runnable [0x0000000040836000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836f5d60> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.catalina.core.StandardServer.await(StandardServer.java:389) > at org.apache.catalina.startup.Catalina.await(Catalina.java:647) > at org.apache.catalina.startup.Catalina.start(Catalina.java:607) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) > at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) > "VM Thread" prio=10 tid=0x00007ff077f1b000 nid=0x7237 runnable > "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x722f runnable > "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x7230 runnable > "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121800 nid=0x7231 runnable > "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x7232 runnable > "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x7233 runnable > "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040127000 nid=0x7234 runnable > "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x7235 runnable > "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x7236 runnable > "VM Periodic Task Thread" prio=10 tid=0x00007ff070007000 nid=0x7241 waiting on condition > JNI global references: 1147 > Heap > PSYoungGen total 670528K, used 301659K [0x00007ff128b90000, 0x00007ff161a80000, 0x00007ff17e0e0000) > eden space 592512K, 37% used [0x00007ff128b90000,0x00007ff136605ee8,0x00007ff14ce30000) > from space 78016K, 99% used [0x00007ff158160000,0x00007ff15cd81020,0x00007ff15cd90000) > to space 78784K, 0% used [0x00007ff15cd90000,0x00007ff15cd90000,0x00007ff161a80000) > PSOldGen total 1465344K, used 1096343K [0x00007ff07e0e0000, 0x00007ff0d77e0000, 0x00007ff128b90000) > object space 1465344K, 74% used [0x00007ff07e0e0000,0x00007ff0c0f85ea0,0x00007ff0d77e0000) > PSPermGen total 54976K, used 54410K [0x00007ff078ce0000, 0x00007ff07c290000, 0x00007ff07e0e0000) > object space 54976K, 98% used [0x00007ff078ce0000,0x00007ff07c2028f0,0x00007ff07c290000) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 10:13:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Thu Mar 18 10:18:37 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <11069486.7364.1268903628643.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3987: ---------------------------------------- Assignee: Bart van der Schans Fix Version/s: r2.12.08 r2.13.00 > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 10:13:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Thu Mar 18 10:18:40 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3976) JCRValueList caching problem In-Reply-To: <8082109.5839.1268738028521.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <745080.7372.1268903628763.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3976?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3976: ---------------------------------------- Assignee: Vijay Kiran Fix Version/s: r2.13.00 > JCRValueList caching problem > ---------------------------- > > Key: HREPTWO-3976 > URL: http://issues.onehippo.com/browse/HREPTWO-3976 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.09.07 > Reporter: Vijay Kiran > Assignee: Vijay Kiran > Fix For: r2.13.00 > > > JCRValueList seems to be caching the values. This is creating problem with taxonomy plugin, which can't get the current values of the property. > See HIPPLUG-58 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 10:15:49 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Thu Mar 18 10:20:39 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3977) UnitTest for JCRValueList In-Reply-To: <16788608.5841.1268738028543.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <1098941.7375.1268903749458.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3977?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3977: ---------------------------------------- Affects Version/s: r2.12.08 r2.13.00 > UnitTest for JCRValueList > ------------------------- > > Key: HREPTWO-3977 > URL: http://issues.onehippo.com/browse/HREPTWO-3977 > Project: Hippo Repository 2 > Issue Type: Task > Affects Versions: r2.12.08, r2.13.00 > Reporter: Vijay Kiran > Assignee: Vijay Kiran > > There's no corresponding unit test for org.hippoecm.frontend.model.map.JcrValueList -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 10:15:49 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Thu Mar 18 10:20:43 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3986) Renaming an image as editor in the imagegallery fails In-Reply-To: <22507126.7239.1268847948530.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10306941.7378.1268903749639.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3986?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3986: ---------------------------------------- Assignee: Bart van der Schans Fix Version/s: r2.12.08 r2.13.00 > Renaming an image as editor in the imagegallery fails > ----------------------------------------------------- > > Key: HREPTWO-3986 > URL: http://issues.onehippo.com/browse/HREPTWO-3986 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jeroen Reijn > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > > Mar 16 16:27:49 myhost javax.jcr.AccessDeniedException: /content/gallery/images/onderwerpen-dossiers-208x208/economie-en-ondernemen/breedband.jpg/hippo:translation/hippo:message: not allowed to modify item > Mar 16 16:27:49 myhost at org.apache.jackrabbit.core.ItemImpl.validateTransientItems(ItemImpl.java:404) > Mar 16 16:27:49 myhost at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1058) > Mar 16 16:27:49 myhost at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > Mar 16 16:27:49 myhost at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > Mar 16 16:27:49 myhost at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > Mar 16 16:27:49 myhost at org.hippoecm.repository.decorating.checked.SessionDecorator.save(SessionDecorator.java:227) > Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:153) > Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) > Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) > Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.StdWorkflow$1$1.onClick(StdWorkflow.java:58) > Mar 16 16:27:49 myhost at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) > Mar 16 16:27:49 myhost at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) > Mar 16 16:27:49 myhost at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > Mar 16 16:27:49 myhost at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > Mar 16 16:27:49 myhost at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > Mar 16 16:27:49 myhost at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > Mar 16 16:27:49 myhost at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > Mar 16 16:27:49 myhost at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > Mar 16 16:27:49 myhost at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > Mar 16 16:27:49 myhost at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) > Mar 16 16:27:49 myhost at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > Mar 16 16:27:49 myhost at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > Mar 16 16:27:49 myhost at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) > Mar 16 16:27:49 myhost at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) > Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191) > Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128) > Mar 16 16:27:49 myhost at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) > Mar 16 16:27:49 myhost at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) > Mar 16 16:27:49 myhost at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:293) > Mar 16 16:27:49 myhost at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > Mar 16 16:27:49 myhost at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > Mar 16 16:27:49 myhost at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > Mar 16 16:27:49 myhost at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > Mar 16 16:27:49 myhost at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > Mar 16 16:27:49 myhost at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690)f -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 10:15:49 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Thu Mar 18 10:20:47 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3977) UnitTest for JCRValueList In-Reply-To: <16788608.5841.1268738028543.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <7912135.7380.1268903749827.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3977?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3977: ---------------------------------------- Fix Version/s: r2.12.08 r2.13.00 > UnitTest for JCRValueList > ------------------------- > > Key: HREPTWO-3977 > URL: http://issues.onehippo.com/browse/HREPTWO-3977 > Project: Hippo Repository 2 > Issue Type: Task > Affects Versions: r2.12.08, r2.13.00 > Reporter: Vijay Kiran > Assignee: Vijay Kiran > Fix For: r2.12.08, r2.13.00 > > > There's no corresponding unit test for org.hippoecm.frontend.model.map.JcrValueList -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 18 13:33:36 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 18 13:38:27 2010 Subject: [HippoRepos-dev] [22159] hippo-ecm/trunk: HREPTWO-3953: Message-ID: <20100318123336.EBA3E1C020@svn.vm.castaserver.com> Revision: 22159 Author: fvlankvelt Date: 2010-03-18 13:33:36 +0100 (Thu, 18 Mar 2010) Log Message: ----------- HREPTWO-3953: show workflow menu Modified Paths: -------------- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/layoutmanager/layoutmanager-debug.js hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/layoutmanager/layoutmanager.js hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/UnitSettings.java hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml Modified: hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html =================================================================== --- hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-18 10:41:23 UTC (rev 22158) +++ hippo-ecm/trunk/addon/cms/edit/src/main/java/org/hippoecm/frontend/plugins/cms/edit/EditPerspective.html 2010-03-18 12:33:36 UTC (rev 22159) @@ -17,10 +17,8 @@
    -
    -
    workflow here
    -
    feedback here
    -
    +
    workflow here
    +
    feedback here
    Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/layoutmanager/layoutmanager-debug.js =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/layoutmanager/layoutmanager-debug.js 2010-03-18 10:41:23 UTC (rev 22158) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/2.7.0/layoutmanager/layoutmanager-debug.js 2010-03-18 12:33:36 UTC (rev 22159) @@ -386,6 +386,12 @@ }, prepareConfig : function() { + for(var i=0; i *
  • - * Z_INDEX: z-index for this unit. TODO: check if this works. + * Z_INDEX: z-index for this unit. *
    • * */ @@ -96,9 +96,8 @@ private boolean resize; private boolean useShim; - //TODO: does this still work? - //private static final IntSetting Z_INDEX = new IntSetting("zindex"); - + private int zIndex; + public static final String TOP = "top"; public static final String RIGHT = "right"; public static final String BOTTOM = "bottom"; @@ -196,4 +195,12 @@ return id; } + public void setZindex(int zIndex) { + this.zIndex = zIndex; + } + + public int getZindex() { + return zIndex; + } + } Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml 2010-03-18 10:41:23 UTC (rev 22158) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-compare.xml 2010-03-18 12:33:36 UTC (rev 22159) @@ -72,7 +72,7 @@ editor-perspective-wrapper - id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 + id=editor-perspective-top,height=24,zindex=1 Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-18 10:41:23 UTC (rev 22158) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-editor.xml 2010-03-18 12:33:36 UTC (rev 22159) @@ -80,7 +80,7 @@ editor-perspective-wrapper - id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 + id=editor-perspective-top,height=24,zindex=1 Modified: hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml =================================================================== --- hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-18 10:41:23 UTC (rev 22158) +++ hippo-ecm/trunk/package/config/src/main/resources/cms-preview.xml 2010-03-18 12:33:36 UTC (rev 22159) @@ -71,7 +71,7 @@ editor-perspective-wrapper - id=editor-perspective-top,body=editor-perspective-top-body,height=24,zindex=1 + id=editor-perspective-top,height=24,zindex=1 From helpdesk at onehippo.com Thu Mar 18 13:52:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 18 13:57:38 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <29300675.7653.1268916768772.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87355#action_87355 ] Stephan Westen commented on HREPTWO-3987: ----------------------------------------- The affects version field lists r2.12.07 whilst the environment field says 2.12.08 snapshot. Afaik the test server with 2.12.07 does not have this problem (tested with author/editor for Nl and Eng). If this issue occurs on 2.12.07 we need to provide configuration instructions how to fix this. > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 13:58:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 18 14:03:46 2010 Subject: [HippoRepos-dev] [JIRA] Reopened: (HREPTWO-3957) Remove hippo:translated mixin from defaultread as it too broad In-Reply-To: <16397734.1728.1268213988678.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30164905.7666.1268917128527.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3957?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier reopened HREPTWO-3957: ---------------------------------------- Assignee: Bart van der Schans (was: Sylvain P?lissier) Bart, could you please describe if there is any lost functionality? 1)What was the purpose of hippo:translated 2)What issue did you detect which took you to the conclusion 3)If any functionality is lost, how can we replace it without being affected by the fact that it is too wide? FWIW - if I look at other 'domain rules' that are defined in domain-defaultread.xml, then I see a property that was not in the original hippo:translated node: true Does that make any difference? Thanks, Sylvain > Remove hippo:translated mixin from defaultread as it too broad > -------------------------------------------------------------- > > Key: HREPTWO-3957 > URL: http://issues.onehippo.com/browse/HREPTWO-3957 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.11, r2.06.17, r2.09.07, r2.12.06 > Reporter: Bart van der Schans > Assignee: Bart van der Schans > Fix For: r2.03.12, r2.06.18, r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 14:00:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Thu Mar 18 14:05:38 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <13766845.7671.1268917248628.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87358#action_87358 ] Jeroen Reijn commented on HREPTWO-3987: --------------------------------------- This also occurs when trying the 2.12.07 on our local environment. If you have a clean database this will show up. I've seen it on all developers environments. If you have an existing database this will not show. > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 18 14:43:02 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 18 14:47:53 2010 Subject: [HippoRepos-dev] [22160] hippo-ecm/trunk: HREPTWO-3930: restyled workflow state icons, greyed out in revision history Message-ID: <20100318134302.7F6011C020@svn.vm.castaserver.com> Revision: 22160 Author: fvlankvelt Date: 2010-03-18 14:43:01 +0100 (Thu, 18 Mar 2010) Log Message: ----------- HREPTWO-3930: restyled workflow state icons, greyed out in revision history Modified Paths: -------------- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/resolvers/StateIconAttributes.java hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-changed-16.png hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-live-16.png hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-new-16.png hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/workflow-requestpublish-16.png hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/workflow-requestunpublish-16.png hippo-ecm/trunk/package/skin/src/main/webapp/screen.css Added Paths: ----------- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-16.png hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-prev-live-16.png hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-prev-new-16.png Removed Paths: ------------- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-changed-16.gif hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-live-16.gif hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-new-16.gif hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/unpublish-scheduled-16.png Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java 2010-03-18 12:33:36 UTC (rev 22159) +++ hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java 2010-03-18 13:43:01 UTC (rev 22160) @@ -172,7 +172,7 @@ .getString(), null) { @Override protected ResourceReference getIcon() { - return new ResourceReference(getClass(), "unplublish-16.png"); + return new ResourceReference(getClass(), "unpublish-16.png"); } @Override Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/publish-schedule-16.png =================================================================== (Binary files differ) Deleted: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unplublish-16.png =================================================================== (Binary files differ) Added: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-16.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-16.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + image/png Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/unpublish-scheduled-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestdelete-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestpublish-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/workflow-requestunpublish-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/resolvers/StateIconAttributes.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/resolvers/StateIconAttributes.java 2010-03-18 12:33:36 UTC (rev 22159) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/list/resolvers/StateIconAttributes.java 2010-03-18 13:43:01 UTC (rev 22160) @@ -85,6 +85,7 @@ if (node != null) { Node document = null; NodeType primaryType = null; + boolean isHistoric = false; if (node.isNodeType(HippoNodeType.NT_HANDLE)) { document = node.getNode(node.getName()); primaryType = document.getPrimaryNodeType(); @@ -92,6 +93,7 @@ document = node; primaryType = document.getPrimaryNodeType(); } else if (node.isNodeType("nt:version")) { + isHistoric = true; Node frozen = node.getNode("jcr:frozenNode"); String primary = frozen.getProperty("jcr:frozenPrimaryType").getString(); NodeTypeManager ntMgr = frozen.getSession().getWorkspace().getNodeTypeManager(); @@ -104,6 +106,7 @@ if (primaryType.isNodeType(HippoStdNodeType.NT_PUBLISHABLESUMMARY) || document.isNodeType(HippoStdNodeType.NT_PUBLISHABLESUMMARY)) { cssClass = StateIconAttributeModifier.PREFIX + + (isHistoric ? "prev-" : "") + document.getProperty(HippoStdNodeType.HIPPOSTD_STATESUMMARY).getString() + StateIconAttributeModifier.SUFFIX; IModel stateModel = new JcrPropertyValueModel(new JcrPropertyModel(document Deleted: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-changed-16.gif =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-changed-16.png =================================================================== (Binary files differ) Deleted: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-live-16.gif =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-live-16.png =================================================================== (Binary files differ) Deleted: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-new-16.gif =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-new-16.png =================================================================== (Binary files differ) Added: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-prev-live-16.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-prev-live-16.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + image/png Added: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-prev-new-16.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/state-prev-new-16.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + image/png Deleted: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/unpublish-scheduled-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/workflow-requestpublish-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/package/skin/src/main/webapp/images/icons/workflow-requestunpublish-16.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/package/skin/src/main/webapp/screen.css =================================================================== --- hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2010-03-18 12:33:36 UTC (rev 22159) +++ hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2010-03-18 13:43:01 UTC (rev 22160) @@ -1072,9 +1072,12 @@ .system-info-48{background-image:url("images/icons/system-info-48.png")} .state-review-16{background-image:url("images/icons/state-review-16.gif")} -.state-changed-16{background-image:url("images/icons/state-changed-16.gif")} -.state-new-16{background-image:url("images/icons/state-new-16.gif")} -.state-live-16{background-image:url("images/icons/state-live-16.gif")} +.state-changed-16{background-image:url("images/icons/state-changed-16.png")} +.state-new-16{background-image:url("images/icons/state-new-16.png")} +.state-live-16{background-image:url("images/icons/state-live-16.png")} +.state-prev-new-16{background-image:url("images/icons/state-prev-new-16.png")} +.state-prev-changed-16{background-image:url("images/icons/state-prev-changed-16.png")} +.state-prev-live-16{background-image:url("images/icons/state-prev-live-16.png")} .permissions-16{background-image:url("images/icons/permissions-16.png")} From helpdesk at onehippo.com Thu Mar 18 14:43:48 2010 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Thu Mar 18 14:48:37 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3988) AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue Message-ID: <19204269.7779.1268919828493.JavaMail.jira@jira.vm.castaserver.com> AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue -------------------------------------------------------------------------------------------------------------------- Key: HREPTWO-3988 URL: http://issues.onehippo.com/browse/HREPTWO-3988 Project: Hippo Repository 2 Issue Type: Bug Reporter: Arthur Bogaart Assignee: Arthur Bogaart Fix For: r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 18 14:46:27 2010 From: svn-logs at hippocms.org (abogaart) Date: Thu Mar 18 14:51:18 2010 Subject: [HippoRepos-dev] [22161] hippo-ecm: HREPTWO-3988 - AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue Message-ID: <20100318134627.1DAB51C020@svn.vm.castaserver.com> Revision: 22161 Author: abogaart Date: 2010-03-18 14:46:26 +0100 (Thu, 18 Mar 2010) Log Message: ----------- HREPTWO-3988 - AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue - fixed! Patch sent to Wicket Modified Paths: -------------- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/AbstractValueMap.java Modified: 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 2010-03-18 13:43:01 UTC (rev 22160) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/model/map/AbstractValueMap.java 2010-03-18 13:46:26 UTC (rev 22161) @@ -328,6 +328,10 @@ * */ public boolean getAsBoolean(String key, boolean defaultValue) { + if (!containsKey(key)) { + return defaultValue; + } + try { return getBoolean(key); } catch (StringValueConversionException ignored) { From helpdesk at onehippo.com Thu Mar 18 14:49:48 2010 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Thu Mar 18 14:54:37 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3988) AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue In-Reply-To: <19204269.7779.1268919828493.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <20092857.7781.1268920188601.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3988?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arthur Bogaart updated HREPTWO-3988: ------------------------------------ Fix Version/s: r2.12.08 > AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue > -------------------------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3988 > URL: http://issues.onehippo.com/browse/HREPTWO-3988 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Fix For: r2.12.08, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 15:40:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Thu Mar 18 15:45:40 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3957) Remove hippo:translated mixin from defaultread as it too broad In-Reply-To: <16397734.1728.1268213988678.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <10114617.7858.1268923248508.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3957?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87393#action_87393 ] Bart van der Schans commented on HREPTWO-3957: ---------------------------------------------- The facet rule was wrong and allowed read permissions to everybody on documents with the mixin hippo:translated. Hence it was removed. > Remove hippo:translated mixin from defaultread as it too broad > -------------------------------------------------------------- > > Key: HREPTWO-3957 > URL: http://issues.onehippo.com/browse/HREPTWO-3957 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.11, r2.06.17, r2.09.07, r2.12.06 > Reporter: Bart van der Schans > Assignee: Bart van der Schans > Fix For: r2.03.12, r2.06.18, r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 15:44:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Thu Mar 18 15:49:37 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3957) Remove hippo:translated mixin from defaultread as it too broad In-Reply-To: <16397734.1728.1268213988678.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <19812424.7863.1268923488540.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3957?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87396#action_87396 ] Bart van der Schans commented on HREPTWO-3957: ---------------------------------------------- @Sylvain, @1: Don't know exactly.. @2: Authors could read documents which they shouldn't be allowed too. @3: By setting the permissions correctly @FWIW: No that doesn't make any difference, the value true is autocreated default Bart > Remove hippo:translated mixin from defaultread as it too broad > -------------------------------------------------------------- > > Key: HREPTWO-3957 > URL: http://issues.onehippo.com/browse/HREPTWO-3957 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.11, r2.06.17, r2.09.07, r2.12.06 > Reporter: Bart van der Schans > Assignee: Bart van der Schans > Fix For: r2.03.12, r2.06.18, r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Thu Mar 18 15:48:28 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 18 15:53:20 2010 Subject: [HippoRepos-dev] [22162] hippo-ecm/trunk: HREPTWO-16: always return same wireframe behavior Message-ID: <20100318144828.E20D51C020@svn.vm.castaserver.com> Revision: 22162 Author: fvlankvelt Date: 2010-03-18 15:48:28 +0100 (Thu, 18 Mar 2010) Log Message: ----------- HREPTWO-16: always return same wireframe behavior There was an exception when the behavior was removed from a plugin. Modified Paths: -------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IBehaviorService.java Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java 2010-03-18 13:46:26 UTC (rev 22161) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/layout/WireframePlugin.java 2010-03-18 14:48:28 UTC (rev 22162) @@ -34,8 +34,11 @@ private static final long serialVersionUID = 1L; + private IBehavior behavior; + public WireframePlugin(IPluginContext context, IPluginConfig config) { super(context, config); + behavior = new WireframeBehavior(new WireframeSettings(YuiPluginHelper.getConfig(getPluginConfig()))); context.registerService(this, config.getString(ID)); } @@ -44,6 +47,6 @@ } public IBehavior getBehavior() { - return new WireframeBehavior(new WireframeSettings(YuiPluginHelper.getConfig(getPluginConfig()))); + return behavior; } } Modified: hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IBehaviorService.java =================================================================== --- hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IBehaviorService.java 2010-03-18 13:46:26 UTC (rev 22161) +++ hippo-ecm/trunk/frontend/engine/src/main/java/org/hippoecm/frontend/service/IBehaviorService.java 2010-03-18 14:48:28 UTC (rev 22162) @@ -19,13 +19,19 @@ import org.apache.wicket.behavior.IBehavior; public interface IBehaviorService extends IClusterable { - @SuppressWarnings("unused") final static String SVN_ID = "$Id$"; String ID = "behavior.id"; String PATH = "behavior.path"; + /** + * The behavior that should be added to the component at relative path {@link #getComponentPath()}. + * Returned behaviors should implement {@link #equals(Object)} and {@link #hashCode()} such that + * multiple requests yield equivalent results. + * + * @return the {@link IBehavior} to be attached to the component. + */ IBehavior getBehavior(); - + String getComponentPath(); } From svn-logs at hippocms.org Thu Mar 18 15:48:57 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 18 15:53:55 2010 Subject: [HippoRepos-dev] [22163] hippo-ecm: HREPTWO-16: more robust title attribute Message-ID: <20100318144857.39F251C020@svn.vm.castaserver.com> Revision: 22163 Author: fvlankvelt Date: 2010-03-18 15:48:56 +0100 (Thu, 18 Mar 2010) Log Message: ----------- HREPTWO-16: more robust title attribute Modified Paths: -------------- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabbedPanel.java Modified: hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabbedPanel.java =================================================================== --- hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabbedPanel.java 2010-03-18 14:48:28 UTC (rev 22162) +++ hippo-ecm/trunk/addon/standards/frontend/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabbedPanel.java 2010-03-18 14:48:56 UTC (rev 22163) @@ -172,7 +172,7 @@ protected String load() { IModel titleModel = tabbieModel.getObject().getTitle(); if (titleModel != null) { - String title = (String) titleModel.getObject(); + String title = titleModel.getObject(); if (title.length() > maxTabLength) { // leave space for two .. then add them title = title.substring(0, maxTabLength - 2) + ".."; @@ -187,7 +187,11 @@ @Override protected String load() { - return tabbieModel.getObject().getTitle().getObject(); + IModel titleModel = tabbieModel.getObject().getTitle(); + if (titleModel != null) { + return titleModel.getObject(); + } + return ""; } }, "")); From svn-logs at hippocms.org Thu Mar 18 15:51:15 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Thu Mar 18 15:56:06 2010 Subject: [HippoRepos-dev] [22164] hippo-ecm/trunk: HREPTWO-3962: remove 'multiple' keyword for field Message-ID: <20100318145115.620941C020@svn.vm.castaserver.com> Revision: 22164 Author: fvlankvelt Date: 2010-03-18 15:51:15 +0100 (Thu, 18 Mar 2010) Log Message: ----------- HREPTWO-3962: remove 'multiple' keyword for field Fields should not share names, as that is their (cross-version) identifier. Modified Paths: -------------- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/RepositoryImpl.java hippo-ecm/trunk/repository/engine/src/main/resources/hipposysedit.cnd Modified: hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml =================================================================== --- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-18 14:48:56 UTC (rev 22163) +++ hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hipposysedit.xml 2010-03-18 14:51:15 UTC (rev 22164) @@ -65,7 +65,7 @@ hipposysedit:remodel - http://www.onehippo.org/jcr/hipposysedit/nt/1.1 + http://www.onehippo.org/jcr/hipposysedit/nt/1.2 @@ -271,7 +271,7 @@ hipposysedit:remodel - http://www.onehippo.org/jcr/hipposysedit/nt/1.1 + http://www.onehippo.org/jcr/hipposysedit/nt/1.2 @@ -311,7 +311,7 @@ hipposysedit:remodel - http://www.onehippo.org/jcr/hipposysedit/nt/1.1 + http://www.onehippo.org/jcr/hipposysedit/nt/1.2 true @@ -456,7 +456,7 @@ hipposysedit:remodel - http://www.onehippo.org/jcr/hipposysedit/nt/1.1 + http://www.onehippo.org/jcr/hipposysedit/nt/1.2 hippo:document @@ -580,7 +580,7 @@ hipposysedit:remodel - http://www.onehippo.org/jcr/hipposysedit/nt/1.1 + http://www.onehippo.org/jcr/hipposysedit/nt/1.2 true 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 2010-03-18 14:48:56 UTC (rev 22163) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/jackrabbit/RepositoryImpl.java 2010-03-18 14:51:15 UTC (rev 22164) @@ -82,7 +82,7 @@ log.info("Initializing hipposys namespace"); safeRegisterNamespace(nsReg, "hipposys", "http://www.onehippo.org/jcr/hipposys/nt/1.0"); log.info("Initializing hipposysedit namespace"); - safeRegisterNamespace(nsReg, "hipposysedit", "http://www.onehippo.org/jcr/hipposysedit/nt/1.1"); + safeRegisterNamespace(nsReg, "hipposysedit", "http://www.onehippo.org/jcr/hipposysedit/nt/1.2"); // TODO HREPTWO-3571 remove the hippofacnav registration here to its own subproject log.info("Initializing hippofacnav namespace: this needs to move to its own subproject, see HREPTWO-3571: "); Modified: hippo-ecm/trunk/repository/engine/src/main/resources/hipposysedit.cnd =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/hipposysedit.cnd 2010-03-18 14:48:56 UTC (rev 22163) +++ hippo-ecm/trunk/repository/engine/src/main/resources/hipposysedit.cnd 2010-03-18 14:51:15 UTC (rev 22164) @@ -16,7 +16,7 @@ - + // mixin on nodetype and prototype nodes for a particular version // of a namespace. @@ -24,8 +24,7 @@ - hipposysedit:uri (string) mandatory [hipposysedit:field] > nt:base -- hipposysedit:name (string) // deprecated, use node name instead -- hipposysedit:path (string) +- hipposysedit:path (string) mandatory - hipposysedit:type (string) - hipposysedit:multiple (boolean) - hipposysedit:mandatory (boolean) @@ -41,7 +40,7 @@ - hipposysedit:node (boolean) - hipposysedit:mixin (boolean) - hipposysedit:cascadevalidation (boolean) -+ * (hipposysedit:field) multiple // multiple is required to support deprecated hipposysedit:field name ++ * (hipposysedit:field) [hipposysedit:prototypeset] + hipposysedit:prototype (nt:base) multiple From helpdesk at onehippo.com Thu Mar 18 16:01:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Thu Mar 18 16:06:37 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3957) Remove hippo:translated mixin from defaultread as it too broad In-Reply-To: <16397734.1728.1268213988678.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17467151.7879.1268924508619.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3957?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87402#action_87402 ] Sylvain P?lissier commented on HREPTWO-3957: -------------------------------------------- @Jeroen, please see the explanation from Bart. > Remove hippo:translated mixin from defaultread as it too broad > -------------------------------------------------------------- > > Key: HREPTWO-3957 > URL: http://issues.onehippo.com/browse/HREPTWO-3957 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.03.11, r2.06.17, r2.09.07, r2.12.06 > Reporter: Bart van der Schans > Assignee: Sylvain P?lissier > Fix For: r2.03.12, r2.06.18, r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 16:54:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Thu Mar 18 16:59:38 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3989) Fields which are marked as multiple can not be set to zero elements Message-ID: <33337834.7968.1268927688521.JavaMail.jira@jira.vm.castaserver.com> Fields which are marked as multiple can not be set to zero elements ------------------------------------------------------------------- Key: HREPTWO-3989 URL: http://issues.onehippo.com/browse/HREPTWO-3989 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07 Environment: Quickstart war 2.12.07 and 2.12.08-SNAPSHOT Reporter: Jeroen Reijn Reproduction path: 1. Login to the cms 2. Go to the browse tab 3. Go to configuration 4. Go to hippo namespaces -> defaultcontent 5. Add new document type 6. Fill in name 'repeater' 7. Select 2 column 8. Finish 9. Add primitive field docbase 10. Mark multiple and ordered 11. Save 12. Update all content 13. Go to documents tab 14. Go to overview folder 15. Add new document of type 'repeater' 16. You will see that there is is a predefinied field already in the template 17. Click the delete 18. You will see that you can not set the repeater to 0 items. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Thu Mar 18 16:58:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Thu Mar 18 17:03:37 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3989) Fields which are marked as multiple can not be set to zero elements In-Reply-To: <33337834.7968.1268927688521.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <7779456.7976.1268927928577.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3989?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3989: ------------------------------------ Assignee: Frank van Lankvelt Fix Version/s: r2.12.08 r2.13.00 Priority: High (was: Normal) > Fields which are marked as multiple can not be set to zero elements > ------------------------------------------------------------------- > > Key: HREPTWO-3989 > URL: http://issues.onehippo.com/browse/HREPTWO-3989 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.07 and 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Priority: High > Fix For: r2.12.08, r2.13.00 > > > Reproduction path: > 1. Login to the cms > 2. Go to the browse tab > 3. Go to configuration > 4. Go to hippo namespaces -> defaultcontent > 5. Add new document type > 6. Fill in name 'repeater' > 7. Select 2 column > 8. Finish > 9. Add primitive field docbase > 10. Mark multiple and ordered > 11. Save > 12. Update all content > 13. Go to documents tab > 14. Go to overview folder > 15. Add new document of type 'repeater' > 16. You will see that there is is a predefinied field already in the template > 17. Click the delete > 18. You will see that you can not set the repeater to 0 items. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Thu Mar 18 17:20:25 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Thu Mar 18 17:20:24 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_became_unstable=3A__Hipp?= =?utf-8?q?o_ECM_Trunk_=C2=BB_Builtin_addon_tests_=231203?= Message-ID: <3122557.101268929225740.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Thu Mar 18 17:20:26 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Thu Mar 18 17:20:28 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_became_unstable=3A__Hipp?= =?utf-8?q?o_ECM_Trunk_=C2=BB_Hippo_ECM_editor_test_addon_=231203?= Message-ID: <1693854.111268929226134.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Thu Mar 18 17:20:28 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Thu Mar 18 17:20:32 2010 Subject: [HippoRepos-dev] Hudson build became unstable: Hippo ECM Trunk #1203 Message-ID: <27335340.121268929228078.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Fri Mar 19 10:08:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 19 10:13:40 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3945) check mime type upon image/asset upload In-Reply-To: <425081.7404.1267786910307.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <28463638.8183.1268989728443.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87476#action_87476 ] Berry van Halderen commented on HREPTWO-3945: --------------------------------------------- All types of content must remain uploadable, otherwise existing installations will break. This by itself isn't a security risk. The rule is that ONLY images will be displayed/opened directly without warning and therefor when the mime-type is an image, then it the actual content MUST also be an image, and not some html/javascript or executable file. This is the check: if something is uploaded and the browser indicates the uploaded asset/image is an image, the content must be an image. Because it was easy AND the most common other content are PDFs, this check is done as well for PDFs and postscript files. The other security part is that ONLY images are opened directly, for the others a system dialog needs to be shown indicating which program will be used to open the content, or whether the user wants to save instead of open the content. So: "do we allow PDFs to be added to the Image Library?" - Yes, and "do we allow JARs when they are renamed as JPGs?" - No. The asset name itself may be something with a jpg suffix, but it may never be opened as such (the mime type must remain not an image). > check mime type upon image/asset upload > --------------------------------------- > > Key: HREPTWO-3945 > URL: http://issues.onehippo.com/browse/HREPTWO-3945 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Berry van Halderen > Assignee: Berry van Halderen > Fix For: r2.12.07, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 10:47:49 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Fri Mar 19 10:52:41 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8476332.8219.1268992069100.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3987: ---------------------------------------- Fix Version/s: (was: r2.12.08) cannot reproduce on 2.12 branch > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 10:54:15 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 10:59:08 2010 Subject: [HippoRepos-dev] [22168] hippo-ecm: HREPTWO-3973: Grant authors read permissions on hippostd :templatequery nodes Message-ID: <20100319095415.218F81C020@svn.vm.castaserver.com> Revision: 22168 Author: bvdschans Date: 2010-03-19 10:54:14 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3973: Grant authors read permissions on hippostd:templatequery nodes Modified Paths: -------------- hippo-ecm/trunk/package/auth/src/main/resources/domain-templates.xml Modified: hippo-ecm/trunk/package/auth/src/main/resources/domain-templates.xml =================================================================== --- hippo-ecm/trunk/package/auth/src/main/resources/domain-templates.xml 2010-03-19 09:20:43 UTC (rev 22167) +++ hippo-ecm/trunk/package/auth/src/main/resources/domain-templates.xml 2010-03-19 09:54:14 UTC (rev 22168) @@ -93,6 +93,31 @@ + + + hipposys:domainrule + + + + hipposys:facetrule + + + true + + + jcr:primaryType + + + false + + + Name + + + hippostd:templatequery + + + hipposys:domainrule From helpdesk at onehippo.com Fri Mar 19 10:54:49 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 10:59:41 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3973) Author cannot create new document In-Reply-To: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17181663.8232.1268992489522.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3973?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87487#action_87487 ] Bart van der Schans commented on HREPTWO-3973: ---------------------------------------------- To fix this in your running project, import the following xml in /hippo:configuration/hippo:domains/templates hipposys:domainrule hipposys:facetrule true jcr:primaryType false Name hippostd:templatequery > Author cannot create new document > --------------------------------- > > Key: HREPTWO-3973 > URL: http://issues.onehippo.com/browse/HREPTWO-3973 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: ongoing > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.12.08, r2.13.00 > > > menu item to create a new document is missing. > cause: security configuration too strict -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 10:56:41 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 11:01:35 2010 Subject: [HippoRepos-dev] [22169] hippo-ecm: HREPTWO-3973: Grant authors read permissions on hippostd :templatequery nodes Message-ID: <20100319095641.3519C1C020@svn.vm.castaserver.com> Revision: 22169 Author: bvdschans Date: 2010-03-19 10:56:40 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3973: Grant authors read permissions on hippostd:templatequery nodes Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-templates.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-templates.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-templates.xml 2010-03-19 09:54:14 UTC (rev 22168) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-templates.xml 2010-03-19 09:56:40 UTC (rev 22169) @@ -93,6 +93,31 @@ + + + hipposys:domainrule + + + + hipposys:facetrule + + + true + + + jcr:primaryType + + + false + + + Name + + + hippostd:templatequery + + + hipposys:domainrule From svn-logs at hippocms.org Fri Mar 19 10:57:43 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 11:02:37 2010 Subject: [HippoRepos-dev] [22170] hippo-ecm: HREPTWO-3973: Grant authors read permissions on hippostd :templatequery nodes Message-ID: <20100319095743.50B641C020@svn.vm.castaserver.com> Revision: 22170 Author: bvdschans Date: 2010-03-19 10:57:42 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3973: Grant authors read permissions on hippostd:templatequery nodes Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-templates.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-templates.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-templates.xml 2010-03-19 09:56:40 UTC (rev 22169) +++ hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-templates.xml 2010-03-19 09:57:42 UTC (rev 22170) @@ -96,6 +96,31 @@ + + + hipposys:domainrule + + + + hipposys:facetrule + + + true + + + jcr:primaryType + + + false + + + Name + + + hippostd:templatequery + + + hipposys:domainrule From helpdesk at onehippo.com Fri Mar 19 10:58:52 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 11:03:44 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3973) Author cannot create new document In-Reply-To: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30260870.8247.1268992732528.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3973?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3973: ----------------------------------------- Fix Version/s: r2.06.18 > Author cannot create new document > --------------------------------- > > Key: HREPTWO-3973 > URL: http://issues.onehippo.com/browse/HREPTWO-3973 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: ongoing > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.06.18, r2.12.08, r2.13.00 > > > menu item to create a new document is missing. > cause: security configuration too strict -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Fri Mar 19 11:07:24 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 11:07:24 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_stable_=3A_Hi?= =?utf-8?q?ppo_ECM_GA_7=2E2_=C2=BB_Reviewed_action_addon_tests_=23117?= In-Reply-To: <1396010.81268760613156.JavaMail.hudson@hudson.onehippo.org> References: <1396010.81268760613156.JavaMail.hudson@hudson.onehippo.org> Message-ID: <2112210.131268993244404.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Fri Mar 19 11:07:25 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 11:07:29 2010 Subject: [HippoRepos-dev] Hudson build is back to stable : Hippo ECM GA 7.2 #117 In-Reply-To: <21219609.91268760614593.JavaMail.hudson@hudson.onehippo.org> References: <21219609.91268760614593.JavaMail.hudson@hudson.onehippo.org> Message-ID: <22137481.141268993245985.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Fri Mar 19 11:02:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 11:07:42 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3973) Author cannot create new document In-Reply-To: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <22319461.8268.1268992968914.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3973?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3973: ----------------------------------------- Fix Version/s: r2.09.08 (was: r2.06.18) > Author cannot create new document > --------------------------------- > > Key: HREPTWO-3973 > URL: http://issues.onehippo.com/browse/HREPTWO-3973 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: ongoing > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.09.08, r2.12.08, r2.13.00 > > > menu item to create a new document is missing. > cause: security configuration too strict -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 11:04:08 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 11:09:02 2010 Subject: [HippoRepos-dev] [22171] hippo-ecm: HREPTWO-3973: Grant authors read permissions on hippostd :templatequery nodes Message-ID: <20100319100408.B4FD61C020@svn.vm.castaserver.com> Revision: 22171 Author: bvdschans Date: 2010-03-19 11:04:08 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3973: Grant authors read permissions on hippostd:templatequery nodes Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-templates.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-templates.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-templates.xml 2010-03-19 09:57:42 UTC (rev 22170) +++ hippo-ecm/branches/Branch-HREPTWO-v2_06_xx/package/auth/src/main/resources/domain-templates.xml 2010-03-19 10:04:08 UTC (rev 22171) @@ -94,6 +94,28 @@ + + + hippo:domainrule + + + + hippo:facetrule + + + jcr:primaryType + + + Name + + + hippostd:templatequery + + + true + + + hippo:domainrule From helpdesk at onehippo.com Fri Mar 19 11:04:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 11:09:39 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3973) Author cannot create new document In-Reply-To: <24251407.4047.1268641428661.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <8122540.8280.1268993088737.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3973?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3973: ----------------------------------------- Fix Version/s: r2.06.18 > Author cannot create new document > --------------------------------- > > Key: HREPTWO-3973 > URL: http://issues.onehippo.com/browse/HREPTWO-3973 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: ongoing > Reporter: Frank van Lankvelt > Assignee: Bart van der Schans > Priority: Blocker > Fix For: r2.06.18, r2.09.08, r2.12.08, r2.13.00 > > > menu item to create a new document is missing. > cause: security configuration too strict -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 11:14:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 11:19:41 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26887658.8303.1268993688762.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3695: ----------------------------------------- Fix Version/s: (was: r2.12.05) > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01, r2.12.06, r2.13.00 > Reporter: Jasha Joachimsthal > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 11:15:03 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Fri Mar 19 11:19:57 2010 Subject: [HippoRepos-dev] [22172] hippo-ecm: HREPTWO-3989: don't autocreate values when not necessary Message-ID: <20100319101503.51B951C020@svn.vm.castaserver.com> Revision: 22172 Author: fvlankvelt Date: 2010-03-19 11:15:02 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3989: don't autocreate values when not necessary Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2010-03-19 10:04:08 UTC (rev 22171) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2010-03-19 10:15:02 UTC (rev 22172) @@ -267,7 +267,8 @@ if (engine != null) { ITypeDescriptor subType = field.getTypeDescriptor(); AbstractProvider provider = newProvider(field, subType, model); - if (IEditor.Mode.EDIT == mode && provider.size() == 0) { + if (IEditor.Mode.EDIT == mode && provider.size() == 0 + && (!field.isMultiple() || field.getValidators().contains("required"))) { provider.addNew(); } return provider; Modified: hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java 2010-03-19 10:04:08 UTC (rev 22171) +++ hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/frontend/editor/field/FieldPluginTest.java 2010-03-19 10:15:02 UTC (rev 22172) @@ -22,6 +22,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import java.util.List; @@ -168,6 +169,37 @@ } @Test + public void dontAutoCreateMultipleWhenNotRequired() throws RepositoryException, TemplateEngineException { + fieldDesc.setMultiple(true); + root.getNode("test/data").getProperty("a").remove(); + root.save(); + + // set up expected service invocations + expect(modelRef.getModel()).andReturn(model); + expectLastCall().times(2); + modelRef.setObservationContext((IObservationContext) anyObject()); + modelRef.startObservation(); + expect(engine.getType(model)).andReturn(typeDesc); + expect(engine.getTemplate(stringType, IEditor.Mode.EDIT)).andReturn(template); + expectLastCall().times(1); + + replay(engine, modelRef); + + // play + JavaPluginConfig config = createPluginConfig("edit"); + start(config); + tester.startPage(home); + + assertFalse(session.itemExists("/test/data/a")); + + List services = context.getServices("service.test", TestService.class); + assertEquals(0, services.size()); + + // verify + verify(engine, modelRef); + } + + @Test public void compareOpensTwoInstancesWhenModeIsNotSupported() throws RepositoryException, TemplateEngineException { // set up expected service invocations expect(modelRef.getModel()).andReturn(model); From svn-logs at hippocms.org Fri Mar 19 11:15:35 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Fri Mar 19 11:20:30 2010 Subject: [HippoRepos-dev] [22173] hippo-ecm: HREPTWO-3989: don't autocreate values when not necessary Message-ID: <20100319101535.D81EB1C021@svn.vm.castaserver.com> Revision: 22173 Author: fvlankvelt Date: 2010-03-19 11:15:35 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3989: don't autocreate values when not necessary Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2010-03-19 10:15:02 UTC (rev 22172) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java 2010-03-19 10:15:35 UTC (rev 22173) @@ -226,7 +226,8 @@ IModel

    model = getModel(); ITypeDescriptor subType = field.getTypeDescriptor(); AbstractProvider provider = newProvider(field, subType, model); - if (ITemplateEngine.EDIT_MODE.equals(mode) && provider.size() == 0) { + if (ITemplateEngine.EDIT_MODE.equals(mode) && provider.size() == 0 + && (!field.isMultiple() || field.getValidators().contains("required"))) { provider.addNew(); } return provider; From helpdesk at onehippo.com Fri Mar 19 11:16:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 11:21:40 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3513) Commit status so far against trunk In-Reply-To: <31397575.264491260278175987.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <1841073.8307.1268993808606.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3513?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3513: ----------------------------------------- Fix Version/s: (was: r2.12.00) > Commit status so far against trunk > ---------------------------------- > > Key: HREPTWO-3513 > URL: http://issues.onehippo.com/browse/HREPTWO-3513 > Project: Hippo Repository 2 > Issue Type: Sub-task > Reporter: Berry van Halderen > Assignee: Bart van der Schans > Fix For: r2.13.00 > > > Commit either to trunk or in seperate branch. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 11:22:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 19 11:27:40 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <30189451.8322.1268994168781.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87507#action_87507 ] Berry van Halderen commented on HREPTWO-3695: --------------------------------------------- This is configured in the property /hippo:namespaces/hippo/resource/editor:templates/_default_/upload > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01, r2.12.06, r2.13.00 > Reporter: Jasha Joachimsthal > Assignee: Sylvain P?lissier > Fix For: r2.12.08, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 11:24:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 11:29:41 2010 Subject: [HippoRepos-dev] [JIRA] Reopened: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <26476655.8331.1268994288640.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans reopened HREPTWO-3695: ------------------------------------------ Assignee: Bart van der Schans (was: Sylvain P?lissier) > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01, r2.12.06, r2.13.00 > Reporter: Jasha Joachimsthal > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 11:24:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 19 11:29:45 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-2913) Include notice files for 6 remaining libraries In-Reply-To: <31939322.5371248855355359.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <9417452.8334.1268994288683.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-2913?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87509#action_87509 ] Sylvain P?lissier commented on HREPTWO-2913: -------------------------------------------- "In addition two copied pieces of software where discovered, and will be added to the NOTICE file." Which ones, please? > Include notice files for 6 remaining libraries > ---------------------------------------------- > > Key: HREPTWO-2913 > URL: http://issues.onehippo.com/browse/HREPTWO-2913 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Stephan Westen > Assignee: Sylvain P?lissier > Fix For: r2.13.00 > > Original Estimate: 4 hours > Remaining Estimate: 4 hours > > Afaik there are 6 libraries that have notice files that are not picked by Maven and we need to include them manually. > Perhaps we can send the owners of the libraries an email asking them to fix the underlying issue. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 11:26:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 11:31:41 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <20819591.8342.1268994408760.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Bart van der Schans updated HREPTWO-3695: ----------------------------------------- Comment: was deleted (was: I've tested the 2.12 branch and the trunk and everything seems to be working fine. The reported issue is probably project specific (configuration).) > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01, r2.12.06, r2.13.00 > Reporter: Jasha Joachimsthal > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 11:31:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Fri Mar 19 11:36:41 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <5368836.8347.1268994708528.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87512#action_87512 ] Jeroen Reijn commented on HREPTWO-3987: --------------------------------------- I just retested and it still occurs: Start quickstart war for 2.12.08-SNAPSHOT: Login with english language with editor/editor > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 11:33:48 2010 From: helpdesk at onehippo.com (JIRA (Jeroen Reijn)) Date: Fri Mar 19 11:38:41 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <6722110.8351.1268994828655.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87514#action_87514 ] Jeroen Reijn commented on HREPTWO-3987: --------------------------------------- Same goes for author user. > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Fix For: r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 11:52:54 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Fri Mar 19 11:57:48 2010 Subject: [HippoRepos-dev] [22175] hippo-ecm/trunk: HREPTWO-3962: provide hipposysedit 1.1 cnd; upgrade test namespace Message-ID: <20100319105254.2470A1C020@svn.vm.castaserver.com> Revision: 22175 Author: fvlankvelt Date: 2010-03-19 11:52:53 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3962: provide hipposysedit 1.1 cnd; upgrade test namespace Modified Paths: -------------- hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml hippo-ecm/trunk/repository/upgrade/pom.xml hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java Added Paths: ----------- hippo-ecm/trunk/repository/upgrade/src/main/resources/ hippo-ecm/trunk/repository/upgrade/src/main/resources/hipposysedit_1_1.cnd Modified: hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml =================================================================== --- hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml 2010-03-19 10:16:36 UTC (rev 22174) +++ hippo-ecm/trunk/addon/editor/test/src/test/resources/org/hippoecm/repository/test-namespace.xml 2010-03-19 10:52:53 UTC (rev 22175) @@ -696,13 +696,10 @@ http://www.hippoecm.org/editor/test/nt/0.1 - + hipposysedit:field - - a - test:a @@ -710,13 +707,10 @@ String - + hipposysedit:field - - b - test:b Modified: hippo-ecm/trunk/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/trunk/repository/upgrade/pom.xml 2010-03-19 10:16:36 UTC (rev 22174) +++ hippo-ecm/trunk/repository/upgrade/pom.xml 2010-03-19 10:52:53 UTC (rev 22175) @@ -57,6 +57,20 @@ install + + + false + ${basedir}/src/main/java + + + false + ${basedir}/src/main/resources + + **/*.xml + **/*.cnd + + + org.apache.maven.plugins Modified: hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java =================================================================== --- hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java 2010-03-19 10:16:36 UTC (rev 22174) +++ hippo-ecm/trunk/repository/upgrade/src/main/java/org/hippoecm/repository/upgrade/Upgrader12a.java 2010-03-19 10:52:53 UTC (rev 22175) @@ -111,7 +111,7 @@ context.registerVisitor(new UpdaterItemVisitor.NamespaceVisitor(context, "hippostdpubwf", "-", new InputStreamReader(getClass().getClassLoader().getResourceAsStream("hippostdpubwf.cnd")))); context.registerVisitor(new UpdaterItemVisitor.NamespaceVisitor(context, "hipposysedit", "-", - new InputStreamReader(getClass().getClassLoader().getResourceAsStream("hipposysedit.cnd")))); + new InputStreamReader(getClass().getClassLoader().getResourceAsStream("hipposysedit_1_1.cnd")))); // re-read parts of the configuration context.registerVisitor(new UpdaterItemVisitor.PathVisitor("/hippo:configuration/hippo:initialize") { Added: hippo-ecm/trunk/repository/upgrade/src/main/resources/hipposysedit_1_1.cnd =================================================================== --- hippo-ecm/trunk/repository/upgrade/src/main/resources/hipposysedit_1_1.cnd (rev 0) +++ hippo-ecm/trunk/repository/upgrade/src/main/resources/hipposysedit_1_1.cnd 2010-03-19 10:52:53 UTC (rev 22175) @@ -0,0 +1,56 @@ +/* + * Copyright 2007-2009 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. + */ + + + + + +// mixin on nodetype and prototype nodes for a particular version +// of a namespace. +[hipposysedit:remodel] mixin +- hipposysedit:uri (string) mandatory + +[hipposysedit:field] > nt:base +- hipposysedit:path (string) +- hipposysedit:type (string) +- hipposysedit:multiple (boolean) +- hipposysedit:mandatory (boolean) +- hipposysedit:ordered (boolean) +- hipposysedit:primary (boolean) +- hipposysedit:autocreated (boolean) +- hipposysedit:protected (boolean) +- hipposysedit:validators (string) multiple + +[hipposysedit:nodetype] > hippo:document orderable +- hipposysedit:type (string) +- hipposysedit:supertype (string) multiple +- hipposysedit:node (boolean) +- hipposysedit:mixin (boolean) +- hipposysedit:cascadevalidation (boolean) ++ * (hipposysedit:field) multiple + +[hipposysedit:prototypeset] ++ hipposysedit:prototype (nt:base) multiple + +[hipposysedit:templatetype] orderable ++ hipposysedit:nodetype (hippo:handle) mandatory ++ hipposysedit:prototypes (hipposysedit:prototypeset) + +[hipposysedit:namespace] ++ * (hipposysedit:templatetype) = hipposysedit:templatetype + +[hipposysedit:namespacefolder] ++ * (hipposysedit:namespace) = hipposysedit:namespace From helpdesk at onehippo.com Fri Mar 19 12:03:48 2010 From: helpdesk at onehippo.com (JIRA (Frank van Lankvelt)) Date: Fri Mar 19 12:08:41 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <9354714.8378.1268996628639.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Frank van Lankvelt updated HREPTWO-3987: ---------------------------------------- Fix Version/s: r2.12.08 Description: The message states [Warning:property for 'section-documents' not found] See screenshot. This happens when the first user to log in to the cms is not admin. was: The message states [Warning:property for 'section-documents' not found] See screenshot. > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Frank van Lankvelt > Fix For: r2.12.08, r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. > This happens when the first user to log in to the cms is not admin. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Fri Mar 19 12:30:03 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 12:30:03 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_still_unstable=3A_Hip?= =?utf-8?q?po_ECM_Trunk_=C2=BB_Builtin_addon_tests_=231204?= In-Reply-To: <3122557.101268929225740.JavaMail.hudson@hudson.onehippo.org> References: <3122557.101268929225740.JavaMail.hudson@hudson.onehippo.org> Message-ID: <316343.151268998203043.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Fri Mar 19 12:30:03 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 12:30:08 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_still_unstable=3A_Hip?= =?utf-8?q?po_ECM_Trunk_=C2=BB_Hippo_ECM_editor_test_addon_=231204?= In-Reply-To: <1693854.111268929226134.JavaMail.hudson@hudson.onehippo.org> References: <1693854.111268929226134.JavaMail.hudson@hudson.onehippo.org> Message-ID: <15183112.161268998203370.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Fri Mar 19 12:30:04 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 12:30:15 2010 Subject: [HippoRepos-dev] Hudson build is still unstable: Hippo ECM Trunk #1204 In-Reply-To: <27335340.121268929228078.JavaMail.hudson@hudson.onehippo.org> References: <27335340.121268929228078.JavaMail.hudson@hudson.onehippo.org> Message-ID: <8882254.171268998204845.JavaMail.hudson@hudson.onehippo.org> See From svn-logs at hippocms.org Fri Mar 19 12:36:27 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 12:41:21 2010 Subject: [HippoRepos-dev] [22176] hippo-ecm: HREPTWO-3987: Allow read privileges to translations Message-ID: <20100319113627.7B5AA1C020@svn.vm.castaserver.com> Revision: 22176 Author: bvdschans Date: 2010-03-19 12:36:27 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3987: Allow read privileges to translations Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-19 10:52:53 UTC (rev 22175) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-19 11:36:27 UTC (rev 22176) @@ -318,6 +318,76 @@ + + + hipposys:domainrule + + + + hipposys:facetrule + + + true + + + jcr:primaryType + + + false + + + Name + + + hippo:translation + + + + + + hipposys:domainrule + + + + hipposys:facetrule + + + true + + + jcr:primaryType + + + false + + + Name + + + nt:base + + + + + hipposys:facetrule + + + true + + + jcr:mixinTypes + + + false + + + Name + + + hippo:translated + + + hipposys:domainrule From svn-logs at hippocms.org Fri Mar 19 12:44:18 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 12:49:12 2010 Subject: [HippoRepos-dev] [22177] hippo-ecm: HREPTWO-3987: Allow read privileges to translations Message-ID: <20100319114418.597D01C020@svn.vm.castaserver.com> Revision: 22177 Author: bvdschans Date: 2010-03-19 12:44:18 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3987: Allow read privileges to translations Modified Paths: -------------- hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml 2010-03-19 11:36:27 UTC (rev 22176) +++ hippo-ecm/trunk/package/auth/src/main/resources/domain-defaultread.xml 2010-03-19 11:44:18 UTC (rev 22177) @@ -293,10 +293,35 @@ - + hipposys:domainrule + + + hipposys:facetrule + + + true + + + jcr:primaryType + + + false + + + Name + + + hippostd:translations + + + + + + hipposys:domainrule + hipposys:facetrule @@ -318,11 +343,11 @@ - + hipposys:domainrule - + hipposys:facetrule @@ -339,9 +364,29 @@ Name - hippostd:translations + nt:base + + + hipposys:facetrule + + + true + + + jcr:mixinTypes + + + false + + + Name + + + hippo:translated + + From helpdesk at onehippo.com Fri Mar 19 12:46:49 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 12:51:41 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3987) Browser perspective looks has missing translations In-Reply-To: <593734.7241.1268849088526.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21798721.8428.1268999209557.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3987?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87530#action_87530 ] Bart van der Schans commented on HREPTWO-3987: ---------------------------------------------- To set the privileges correctly in a running system import the following to nodes in /hippo:configuration/hippo:domains/defaultread and restart the cms. hipposys:domainrule hipposys:facetrule true jcr:primaryType false Name hippo:translation hipposys:domainrule hipposys:facetrule true jcr:primaryType false Name nt:base hipposys:facetrule true jcr:mixinTypes false Name hippo:translated > Browser perspective looks has missing translations > -------------------------------------------------- > > Key: HREPTWO-3987 > URL: http://issues.onehippo.com/browse/HREPTWO-3987 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: Quickstart war 2.12.08-SNAPSHOT > Reporter: Jeroen Reijn > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: warning-in-browser-perspective.png > > > The message states [Warning:property for 'section-documents' not found] > See screenshot. > This happens when the first user to log in to the cms is not admin. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 12:48:01 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 12:52:56 2010 Subject: [HippoRepos-dev] [22178] hippo-ecm: HREPTWO-3987: Allow read privileges to translations Message-ID: <20100319114801.BDD731C020@svn.vm.castaserver.com> Revision: 22178 Author: bvdschans Date: 2010-03-19 12:48:01 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3987: Allow read privileges to translations Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-19 11:44:18 UTC (rev 22177) +++ hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/package/auth/src/main/resources/domain-defaultread.xml 2010-03-19 11:48:01 UTC (rev 22178) @@ -296,10 +296,35 @@ - + hipposys:domainrule + + + hipposys:facetrule + + + true + + + jcr:primaryType + + + false + + + Name + + + hippostd:translations + + + + + + hipposys:domainrule + hipposys:facetrule @@ -321,11 +346,11 @@ - + hipposys:domainrule - + hipposys:facetrule @@ -342,9 +367,29 @@ Name - hippostd:translations + nt:base + + + hipposys:facetrule + + + true + + + jcr:mixinTypes + + + false + + + Name + + + hippo:translated + + From helpdesk at onehippo.com Fri Mar 19 13:06:48 2010 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Fri Mar 19 13:11:40 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3990) IE7: internal links are broken after save Message-ID: <26555376.8441.1269000408578.JavaMail.jira@jira.vm.castaserver.com> IE7: internal links are broken after save ----------------------------------------- Key: HREPTWO-3990 URL: http://issues.onehippo.com/browse/HREPTWO-3990 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.07, r2.09.07 Environment: Windows: IE7 Reporter: Arthur Bogaart Assignee: Arthur Bogaart Priority: Top Fix For: r2.09.08, r2.12.08, r2.13.00 When saving a Xinha field with an existing internal link, IE7 seems to make the relative a@href value absolute, ie: becomes which breaks the internal link. The LinkProcessor will also remove the facet-select. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 13:06:48 2010 From: helpdesk at onehippo.com (JIRA (Arthur Bogaart)) Date: Fri Mar 19 13:11:46 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3990) IE7: internal links are broken after save In-Reply-To: <26555376.8441.1269000408578.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21910972.8443.1269000408613.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3990?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arthur Bogaart updated HREPTWO-3990: ------------------------------------ Fix Version/s: (was: r2.12.08) > IE7: internal links are broken after save > ----------------------------------------- > > Key: HREPTWO-3990 > URL: http://issues.onehippo.com/browse/HREPTWO-3990 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.09.07, r2.12.07 > Environment: Windows: IE7 > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Priority: Top > Fix For: r2.09.08, r2.13.00 > > > When saving a Xinha field with an existing internal link, IE7 seems to make the relative a@href value absolute, ie: becomes which breaks the internal link. The LinkProcessor will also remove the facet-select. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 13:16:36 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 13:21:31 2010 Subject: [HippoRepos-dev] [22179] hippo-ecm: HREPTWO-3695: Allow all types by default in resource upload Message-ID: <20100319121636.9A9931C021@svn.vm.castaserver.com> Revision: 22179 Author: bvdschans Date: 2010-03-19 13:16:36 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3695: Allow all types by default in resource upload Modified Paths: -------------- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hippo.xml Modified: hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java =================================================================== --- hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-19 11:48:01 UTC (rev 22178) +++ hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-19 12:16:36 UTC (rev 22179) @@ -53,7 +53,11 @@ public ResourceUploadPlugin(IPluginContext context, IPluginConfig config) { super(context, config); - types = new ValueMap(config.getString("types")); + // if the types config is not set, all extensions are allowed + String typesConfig = config.getString("types"); + if (typesConfig != null) { + types = new ValueMap(typesConfig); + } add(form = new FileUploadForm("form")); String mode = config.getString("mode", "edit"); @@ -81,14 +85,27 @@ final FileUpload upload = fileUploadField.getFileUpload(); if (upload != null) { String fileName = upload.getClientFileName(); + String mimeType = upload.getContentType(); + String extension = fileName.substring(fileName.lastIndexOf('.') + 1); - - String type = types.getString(extension.toLowerCase()); - if (type != null) { + + // check if obligatory types/file extensions are set and matched + if (types != null && types.getString(extension.toLowerCase()) == null) { + String extensions = StringUtils.join(types.keySet().toArray(), ", "); + getDialogService().show( + new ExceptionDialog(new StringResourceModel("unrecognized", ResourceUploadPlugin.this, + null, new Object[] { extension, extensions }).getString()) { + public IValueMap getProperties() { + return SMALL; + } + + }); + log.warn("Unrecognised file type"); + } else { JcrNodeModel nodeModel = (JcrNodeModel) ResourceUploadPlugin.this.getDefaultModel(); Node node = nodeModel.getNode(); try { - node.setProperty("jcr:mimeType", type); + node.setProperty("jcr:mimeType", mimeType); node.setProperty("jcr:data", upload.getInputStream()); node.setProperty("jcr:lastModified", Calendar.getInstance()); new ImageUtils().validateResource(node, fileName); @@ -99,21 +116,8 @@ // FIXME: report back to user log.error(ex.getMessage()); } - } else { - String extensions = StringUtils.join(types.keySet().toArray(), ", "); - getDialogService().show( - new ExceptionDialog(new StringResourceModel("unrecognized", ResourceUploadPlugin.this, - null, new Object[] { extension, extensions }).getString()) { - - public IValueMap getProperties() { - return SMALL; - } - - }); - log.warn("Unrecognised file type"); } } } } - } Modified: hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hippo.xml =================================================================== --- hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hippo.xml 2010-03-19 11:48:01 UTC (rev 22178) +++ hippo-ecm/trunk/addon/editor/repository/src/main/resources/namespace-hippo.xml 2010-03-19 12:16:36 UTC (rev 22179) @@ -289,9 +289,6 @@ org.hippoecm.frontend.editor.plugins.resource.ResourceUploadPlugin - - png=image/png,jpeg=image/jpeg,jpg=image/jpeg,gif=image/gif,pdf=application/pdf,doc=application/msword,xls=application/vnd.ms-excel - ${cluster.id}.field From svn-logs at hippocms.org Fri Mar 19 13:17:53 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 13:22:48 2010 Subject: [HippoRepos-dev] [22180] hippo-ecm: HREPTWO-3695: Allow all types by default in resource upload Message-ID: <20100319121753.93C4D1C020@svn.vm.castaserver.com> Revision: 22180 Author: bvdschans Date: 2010-03-19 13:17:53 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3695: Allow all types by default in resource upload Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/resources/namespace-hippo.xml Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor ___________________________________________________________________ Added: svn:mergeinfo + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor:20604-20690 /hippo-ecm/trunk/addon/editor:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/common/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflow.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:20604-20690 /hippo-ecm/trunk/addon/editor/common/src/main/java/org/hippoecm/editor/repository/EditmodelWorkflow.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/editor/common/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20255-20460 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/editor/tools/JcrNamespace.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/editor/type/JcrNamespace.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-19 12:16:36 UTC (rev 22179) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ResourceUploadPlugin.java 2010-03-19 12:17:53 UTC (rev 22180) @@ -53,7 +53,11 @@ public ResourceUploadPlugin(IPluginContext context, IPluginConfig config) { super(context, config); - types = new ValueMap(config.getString("types")); + // if the types config is not set, all extensions are allowed + String typesConfig = config.getString("types"); + if (typesConfig != null) { + types = new ValueMap(typesConfig); + } add(form = new FileUploadForm("form")); String mode = config.getString("mode", "edit"); @@ -81,14 +85,27 @@ final FileUpload upload = fileUploadField.getFileUpload(); if (upload != null) { String fileName = upload.getClientFileName(); + String mimeType = upload.getContentType(); + String extension = fileName.substring(fileName.lastIndexOf('.') + 1); - - String type = types.getString(extension.toLowerCase()); - if (type != null) { + + // check if obligatory types/file extensions are set and matched + if (types != null && types.getString(extension.toLowerCase()) == null) { + String extensions = StringUtils.join(types.keySet().toArray(), ", "); + getDialogService().show( + new ExceptionDialog(new StringResourceModel("unrecognized", ResourceUploadPlugin.this, + null, new Object[] { extension, extensions }).getString()) { + public IValueMap getProperties() { + return SMALL; + } + + }); + log.warn("Unrecognised file type"); + } else { JcrNodeModel nodeModel = (JcrNodeModel) ResourceUploadPlugin.this.getDefaultModel(); Node node = nodeModel.getNode(); try { - node.setProperty("jcr:mimeType", type); + node.setProperty("jcr:mimeType", mimeType); node.setProperty("jcr:data", upload.getInputStream()); node.setProperty("jcr:lastModified", Calendar.getInstance()); new ImageUtils().validateResource(node, fileName); @@ -99,21 +116,8 @@ // FIXME: report back to user log.error(ex.getMessage()); } - } else { - String extensions = StringUtils.join(types.keySet().toArray(), ", "); - getDialogService().show( - new ExceptionDialog(new StringResourceModel("unrecognized", ResourceUploadPlugin.this, - null, new Object[] { extension, extensions }).getString()) { - - public IValueMap getProperties() { - return SMALL; - } - - }); - log.warn("Unrecognised file type"); } } } } - } Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.html:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.html:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/addon/builtin/frontend/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/EditmodelWorkflowPlugin_nl.properties:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:20604-20690 /hippo-ecm/trunk/addon/editor/frontend/src/main/java/org/hippoecm/frontend/editor/workflow/EditmodelWorkflowPlugin_nl.properties:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine/src/main/java/org/hippoecm/repository/standardworkflow/EditmodelWorkflowImpl.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:20604-20690 /hippo-ecm/trunk/addon/editor/repository/src/main/java/org/hippoecm/editor/repository/impl/EditmodelWorkflowImpl.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/resources/namespace-hippo.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/resources/namespace-hippo.xml 2010-03-19 12:16:36 UTC (rev 22179) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/src/main/resources/namespace-hippo.xml 2010-03-19 12:17:53 UTC (rev 22180) @@ -289,9 +289,6 @@ org.hippoecm.frontend.editor.plugins.resource.ResourceUploadPlugin - - png=image/png,jpeg=image/jpeg,jpg=image/jpeg,gif=image/gif,pdf=application/pdf,doc=application/msword,xls=application/vnd.ms-excel - ${cluster.id}.field Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java ___________________________________________________________________ Modified: svn:mergeinfo - /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:20604-20690 /hippo-ecm/trunk/addon/editor/test/src/test/java/org/hippoecm/repository/HREPTWO2182Test.java:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22179 From helpdesk at onehippo.com Fri Mar 19 13:19:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 13:24:40 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3695) Filter on binary uploads is inconsistent In-Reply-To: <28314133.220191264507020226.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2551167.8446.1269001188551.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3695?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87534#action_87534 ] Bart van der Schans commented on HREPTWO-3695: ---------------------------------------------- Removing the types property in /hippo:namespaces/hippo/resource/editor:templates/_default_/upload allows the upload of all file types. > Filter on binary uploads is inconsistent > ---------------------------------------- > > Key: HREPTWO-3695 > URL: http://issues.onehippo.com/browse/HREPTWO-3695 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.11.01, r2.12.06, r2.13.00 > Reporter: Jasha Joachimsthal > Assignee: Bart van der Schans > Fix For: r2.12.08, r2.13.00 > > Attachments: screenshot-1.jpg, style.css > > > Upload a new file (style.css, see attachment), no problem. > Click on the new asset, click edit. Upload the same file or an "updated" version: exception: Invalid extension css. Valid extensions are png, jpeg, jpg, gif, pdf, doc, xls. > Why is there a restriction at all and can it be removed? > Workaround: upload a new binary from the updated file and delete the old one. This will break existing references. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 13:21:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 19 13:26:39 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3991) Tag 2.12.08 Message-ID: <8350686.8449.1269001308536.JavaMail.jira@jira.vm.castaserver.com> Tag 2.12.08 ----------- Key: HREPTWO-3991 URL: http://issues.onehippo.com/browse/HREPTWO-3991 Project: Hippo Repository 2 Issue Type: Task Affects Versions: r2.12.08 Reporter: Berry van Halderen Assignee: Berry van Halderen Fix For: r2.12.08 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 13:23:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 19 13:28:41 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3869) StringCodecFactory issues In-Reply-To: <15176016.820.1266960110389.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <17058182.8452.1269001428679.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3869?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87535#action_87535 ] Sylvain P?lissier commented on HREPTWO-3869: -------------------------------------------- Small details in the documentation encoding.html : I read: A non brakable space is converted into a regular space; I expect: A non breakable space is converted into a regular space; I read: leading spaces and ending spaces are removed. I expect: Leading spaces and ending spaces are removed. Table 1 ------- I read: : converted into hyphen adding leading and ending space I get: : converted into two hyphens adding leading I read: ; converted into hyphen adding leading and ending space I get: ; converted into two hyphens adding leading Table 2 ------- I read: ? - I expect: ? plusminus I read: ? d I expect: ? D Table 3 ------- These extra characters are found in Table 3, not in Table 2. And I don't know how to represent them in order to check whether they are translated as expected. These I skipped: UTF-8 c380A UTF-8 c381A UTF-8 c382A UTF-8 c383A UTF-8 c384A UTF-8 c385A UTF-8 c386AE UTF-8 c387C UTF-8 c388E UTF-8 c389E UTF-8 c38aE UTF-8 c38bE UTF-8 c38cI UTF-8 c38dI UTF-8 c38eI UTF-8 c38fI UTF-8 c390D UTF-8 c391N UTF-8 c392O UTF-8 c393O UTF-8 c394O UTF-8 c395O UTF-8 c396O UTF-8 c397x > StringCodecFactory issues > ------------------------- > > Key: HREPTWO-3869 > URL: http://issues.onehippo.com/browse/HREPTWO-3869 > Project: Hippo Repository 2 > Issue Type: Improvement > Components: repository-interface > Affects Versions: r2.12.04 > Reporter: Rob van der Linden Vooren > Assignee: Sylvain P?lissier > Priority: High > Fix For: r2.13.00 > > Attachments: StringCodecFactory-rev21850.zip > > > StringCodecFactory was introduced to support readable urls and is currently used in core Hippo CMS Plugins. > Our project relies on this infrastructure factory in order to hook up our custom naming scheme. > In the process of implementing the custom naming scheme, I found some issues with the current implementation as mentioned below. > 1] direct use of Class.forName introduces potential class loading issues > 2] any exception that could occur loading a StringCodec class or instantiating it, are silently swallowed, returning null > 3] StringCodecs class definitions are reloaded on each 'getStringCodec(String ...)' call, introducing a performance hit > 4] 'getStringCodec()' method is unused and even when called would produce NullPointerException > 5] missing documentation > 6] missing behavior change detectors (tests) > I have addressed these issues in the patch attached (for trunk, rev 21850). > Please review. > Kind regards, > Rob van der Linden Vooren -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 13:28:33 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Fri Mar 19 13:33:27 2010 Subject: [HippoRepos-dev] [22181] hippo-ecm: HREPTWO-3991: bumb release information Message-ID: <20100319122833.1D9691C020@svn.vm.castaserver.com> Revision: 22181 Author: bvanhalderen Date: 2010-03-19 13:28:32 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3991: bumb release information Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-19 12:17:53 UTC (rev 22180) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-19 12:28:32 UTC (rev 22181) @@ -419,8 +419,8 @@ true true - HREPTWO-3967: - Tag-HREPTWO-v2_12_07 + HREPTWO-3991: + Tag-HREPTWO-v2_12_08 From svn-logs at hippocms.org Fri Mar 19 14:32:48 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Fri Mar 19 14:37:43 2010 Subject: [HippoRepos-dev] [22182] hippo-ecm: HREPTWO-3961: provide locale to daisy-diff Message-ID: <20100319133248.69C681C020@svn.vm.castaserver.com> Revision: 22182 Author: fvlankvelt Date: 2010-03-19 14:32:48 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3961: provide locale to daisy-diff Modified Paths: -------------- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java 2010-03-19 12:28:32 UTC (rev 22181) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java 2010-03-19 13:32:48 UTC (rev 22182) @@ -23,6 +23,7 @@ import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; +import org.apache.wicket.Session; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.outerj.daisy.diff.DaisyDiff; @@ -63,7 +64,7 @@ handler.setResult(dr); handler.startDocument(); handler.startElement(null, "html", "html", new AttributesImpl()); - DaisyDiff.diffHTML(oldSource, newSource, handler, null, null); + DaisyDiff.diffHTML(oldSource, newSource, handler, null, Session.get().getLocale()); handler.endElement(null, "html", "html"); handler.endDocument(); From svn-logs at hippocms.org Fri Mar 19 15:22:16 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Fri Mar 19 15:27:15 2010 Subject: [HippoRepos-dev] [22184] hippo-ecm: HREPTWO-3991:prepare release Tag-HREPTWO-v2_12_08 Message-ID: <20100319142216.6365B1C020@svn.vm.castaserver.com> Revision: 22184 Author: bvanhalderen Date: 2010-03-19 15:22:15 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3991:prepare release Tag-HREPTWO-v2_12_08 Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08-SNAPSHOT + 2.12.08 Builtin common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/common org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08-SNAPSHOT + 2.12.08 Builtin frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/frontend @@ -42,34 +42,34 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Builtin addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08-SNAPSHOT + 2.12.08 Builtin repository addon @@ -28,22 +28,22 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/repository org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08-SNAPSHOT + 2.12.08 Builtin addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/test @@ -45,25 +45,25 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test @@ -81,7 +81,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test @@ -93,109 +93,109 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-repository-upgrade - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-repository-connector - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-repository-modules - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-plugins - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-package-auth - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-package-config - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-gotolink - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08-SNAPSHOT + 2.12.08 CMS admin addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/admin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/admin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/admin @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided @@ -59,13 +59,13 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-connector - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08-SNAPSHOT + 2.12.08 CMS browse addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/browse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/browse + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/browse @@ -45,34 +45,34 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 @@ -80,13 +80,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08-SNAPSHOT + 2.12.08 CMS dashboard addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/dashboard + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/dashboard + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/dashboard @@ -49,44 +49,44 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08-SNAPSHOT + 2.12.08 CMS edit addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/edit + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/edit + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/edit @@ -45,50 +45,50 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 CMS addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08-SNAPSHOT + 2.12.08 CMS root addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/root + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/root + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/root @@ -45,24 +45,24 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.08-SNAPSHOT + 2.12.08 Defaultcontent frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/defaultcontent/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/defaultcontent/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/defaultcontent/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Default content addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.08-SNAPSHOT + 2.12.08 Defaultcontent repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-repository-utilities - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Eavesdrop @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/eavesdrop + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/eavesdrop + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/eavesdrop @@ -49,27 +49,27 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-frontend-plugins - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-connector - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM editor common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/common org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM editor frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/frontend @@ -47,46 +47,46 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Editor addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-editor - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM editor repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/repository @@ -42,22 +42,22 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-utilities - 2.12.08-SNAPSHOT + 2.12.08 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM editor test addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/test @@ -50,60 +50,60 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.08-SNAPSHOT + 2.12.08 Faceted date frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Faceted date addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.08-SNAPSHOT + 2.12.08 Faceted date repository addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/repository org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided @@ -61,19 +61,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.08-SNAPSHOT + 2.12.08 Gallery common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.08-SNAPSHOT + 2.12.08 Gallery frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/frontend @@ -42,39 +42,39 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Gallery Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.08-SNAPSHOT + 2.12.08 Gallery Addon @@ -28,21 +28,21 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/repository org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08-SNAPSHOT + 2.12.08 javax.jcr Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Goto frontend addon @@ -27,16 +27,16 @@ hippo-ecm-addon-gotolink - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gotolink + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gotolink + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gotolink org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided @@ -47,7 +47,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Ldap Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-ldap - 2.12.08-SNAPSHOT + 2.12.08 Ldap Addon Repository @@ -35,13 +35,13 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 provided @@ -53,9 +53,9 @@ - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Addons @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.08-SNAPSHOT + 2.12.08 Reporting frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/frontend @@ -42,13 +42,13 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Reporting addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.08-SNAPSHOT + 2.12.08 Reporting repository addon @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08-SNAPSHOT + 2.12.08 Reviewed action common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/common @@ -42,12 +42,12 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08-SNAPSHOT + 2.12.08 Reviewed action frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/frontend @@ -42,44 +42,44 @@ org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Reviewed action addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08-SNAPSHOT + 2.12.08 Reviewed action repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/repository @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08-SNAPSHOT + 2.12.08 Reviewed action addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/test @@ -51,49 +51,49 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-package-auth - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 test @@ -104,7 +104,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08-SNAPSHOT + 2.12.08 Sample common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08-SNAPSHOT + 2.12.08 Sample frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/frontend @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-sample-common - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Sample addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08-SNAPSHOT + 2.12.08 Sample repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository @@ -43,17 +43,17 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-connector - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-sample-common - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08-SNAPSHOT + 2.12.08 Sample addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/test @@ -51,31 +51,31 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-sample-common - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-sample-frontend - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-sample-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-search - 2.12.08-SNAPSHOT + 2.12.08 Search frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Search Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-standards - 2.12.08-SNAPSHOT + 2.12.08 Standards frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards/frontend @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided @@ -60,13 +60,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Standards addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Versioning frontend addon @@ -27,9 +27,9 @@ hippo-ecm-addon-versioning - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/versioning + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/versioning + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/versioning @@ -41,30 +41,30 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Workflow @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/workflow + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/workflow + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/workflow @@ -49,26 +49,26 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 jar provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Xinha addon @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 Xinha addon frontend plugin @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha-frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha-frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha-frontend @@ -45,19 +45,19 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 hippo @@ -73,20 +73,20 @@ org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08-SNAPSHOT + 2.12.08 YUI frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/yui + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/yui + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/yui @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 API @@ -27,9 +27,9 @@ hippo-ecm-api - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/api + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/api + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/api Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-archetypes - 2.12.08-SNAPSHOT + 2.12.08 Addon archetype @@ -28,9 +28,9 @@ maven-archetype - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Archetypes @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08-SNAPSHOT + 2.12.08 Minimal frontend app @@ -28,21 +28,21 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/application org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-frontend-plugins - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08-SNAPSHOT + 2.12.08 Frontend engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/engine @@ -58,19 +58,19 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-repository-connector - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.apache.wicket Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08-SNAPSHOT + 2.12.08 Frontend plugins @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/plugins + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/plugins + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/plugins @@ -50,22 +50,22 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-tools-projectexport - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-yui - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Frontend @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08-SNAPSHOT + 2.12.08 Frontend engine test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/test @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided @@ -53,19 +53,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM authorisation configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/auth + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/auth + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/auth Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM package configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/config + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/config + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/config Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM EAR package @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08-SNAPSHOT + 2.12.08 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08-SNAPSHOT + 2.12.08 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-frontend-application - 2.12.08-SNAPSHOT + 2.12.08 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM CMS layout @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/layout + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/layout + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/layout Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM package @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package - https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package + https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM package skin @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/skin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/skin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/skin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM package test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/test @@ -48,34 +48,34 @@ org.hippoecm hippo-ecm-package-war - 2.12.08-SNAPSHOT + 2.12.08 war test org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-package-ear - 2.12.08-SNAPSHOT + 2.12.08 ear test org.hippoecm hippo-ecm-quickstart-ear - 2.12.08-SNAPSHOT + 2.12.08 ear test org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM WAR package @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08-SNAPSHOT + 2.12.08 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08-SNAPSHOT + 2.12.08 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-frontend-application - 2.12.08-SNAPSHOT + 2.12.08 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -17,7 +17,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM The core of Hippo ECM, i.e. repository 2, plus an advanced webbased userinterface for content management: CMS, @@ -92,9 +92,9 @@ This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html --> - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM BIN quickstart @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/bin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/bin + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/bin org.hippoecm hippo-ecm-quickstart-war - 2.12.08-SNAPSHOT + 2.12.08 war Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM EAR quickstart @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08-SNAPSHOT + 2.12.08 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08-SNAPSHOT + 2.12.08 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-frontend-application - 2.12.08-SNAPSHOT + 2.12.08 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -285,7 +285,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08-SNAPSHOT + 2.12.08 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM quickstart @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart - https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart + https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.08-SNAPSHOT + 2.12.08 Hippo ECM WAR quickstart @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08-SNAPSHOT + 2.12.08 war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08-SNAPSHOT + 2.12.08 war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08-SNAPSHOT + 2.12.08 war org.hippoecm hippo-ecm-frontend-application - 2.12.08-SNAPSHOT + 2.12.08 war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -285,13 +285,13 @@ org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.08-SNAPSHOT + 2.12.08 jar org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08-SNAPSHOT + 2.12.08 jar @@ -346,19 +346,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Minimal repository app @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/application @@ -46,17 +46,17 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-upgrade - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 commons-lang @@ -72,7 +72,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Repository connector @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/connector + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/connector + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/connector @@ -53,7 +53,7 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.slf4j @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Repository engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/engine @@ -69,22 +69,22 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-connector - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-modules - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-utilities - 2.12.08-SNAPSHOT + 2.12.08 org.apache.lucene @@ -99,7 +99,7 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 @@ -112,7 +112,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Repository JCA @@ -27,9 +27,9 @@ hippo-ecm-repository-jca rar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/jca + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/jca + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/jca package @@ -153,182 +153,182 @@ org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-package-auth - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-package-config - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-versioning - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-gotolink - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-editor-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-cms-root - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-workflow - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-frontend-plugins - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Repository modules @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/modules + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/modules + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/modules @@ -51,12 +51,12 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-utilities - 2.12.08-SNAPSHOT + 2.12.08 org.slf4j Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Repository @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Repository test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/test @@ -45,14 +45,14 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test @@ -76,13 +76,13 @@ org.hippoecm hippo-ecm-addon-builtin-repository test - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 test @@ -126,13 +126,13 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-addon-builtin-test - 2.12.08-SNAPSHOT + 2.12.08 jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Repository upgrade module @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-repository-utilities - 2.12.08-SNAPSHOT + 2.12.08 Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08-SNAPSHOT + 2.12.08 Repository Generic JCR Utilities @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/utilities + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/utilities + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/utilities @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/development-content + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/development-content + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/development-content @@ -45,48 +45,48 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-frontend-plugins - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08-SNAPSHOT + 2.12.08 provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/documentation + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/documentation + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/documentation Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08-SNAPSHOT + 2.12.08 hippo-ecm-tools-eclipse @@ -36,9 +36,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/eclipse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/eclipse + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/eclipse Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08-SNAPSHOT + 2.12.08 Tools @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm @@ -28,52 +28,52 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/projectexport + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/projectexport + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/projectexport org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-package-config - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08-SNAPSHOT + 2.12.08 test org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 provided org.hippoecm hippo-ecm-tools-testutils - 2.12.08-SNAPSHOT + 2.12.08 test @@ -90,22 +90,22 @@ org.hippoecm hippo-ecm-api - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-frontend-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-engine - 2.12.08-SNAPSHOT + 2.12.08 org.hippoecm hippo-ecm-repository-utilities - 2.12.08-SNAPSHOT + 2.12.08 com.atomikos Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-19 13:46:28 UTC (rev 22183) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-19 14:22:15 UTC (rev 22184) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08-SNAPSHOT + 2.12.08 Test utilities @@ -29,9 +29,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils - http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/testutils + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/testutils + http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/testutils From svn-logs at hippocms.org Fri Mar 19 15:27:00 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Fri Mar 19 15:31:54 2010 Subject: [HippoRepos-dev] [22185] hippo-ecm/tags/Tag-HREPTWO-v2_12_08/: HREPTWO-3991: copy for tag Tag-HREPTWO-v2_12_08 Message-ID: <20100319142700.3C31C1C020@svn.vm.castaserver.com> Revision: 22185 Author: bvanhalderen Date: 2010-03-19 15:26:59 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3991: copy for tag Tag-HREPTWO-v2_12_08 Added Paths: ----------- hippo-ecm/tags/Tag-HREPTWO-v2_12_08/ Property changes on: hippo-ecm/tags/Tag-HREPTWO-v2_12_08 ___________________________________________________________________ Added: svn:ignore + *.tmp .classpath .project .settings local.properties nbproject target jpox.log Added: svn:mergeinfo + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4:20604-20690 /hippo-ecm/trunk:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071 From svn-logs at hippocms.org Fri Mar 19 15:27:11 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Fri Mar 19 15:32:11 2010 Subject: [HippoRepos-dev] [22186] hippo-ecm: HREPTWO-3991:prepare for next development iteration Message-ID: <20100319142712.180B41C020@svn.vm.castaserver.com> Revision: 22186 Author: bvanhalderen Date: 2010-03-19 15:27:11 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3991:prepare for next development iteration Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08 + 2.12.09-SNAPSHOT Builtin common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/common org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08 + 2.12.09-SNAPSHOT Builtin frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/frontend @@ -42,34 +42,34 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Builtin addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08 + 2.12.09-SNAPSHOT Builtin repository addon @@ -28,22 +28,22 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/repository org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-builtin - 2.12.08 + 2.12.09-SNAPSHOT Builtin addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/builtin/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/builtin/test @@ -45,25 +45,25 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test @@ -81,7 +81,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test @@ -93,109 +93,109 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-repository-upgrade - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-repository-connector - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-repository-modules - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-plugins - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-package-auth - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-package-config - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-gotolink - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08 + 2.12.09-SNAPSHOT CMS admin addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/admin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/admin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/admin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/admin @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided @@ -59,13 +59,13 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08 + 2.12.09-SNAPSHOT CMS browse addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/browse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/browse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/browse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/browse @@ -45,34 +45,34 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT @@ -80,13 +80,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08 + 2.12.09-SNAPSHOT CMS dashboard addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/dashboard - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/dashboard - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/dashboard + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/dashboard @@ -49,44 +49,44 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08 + 2.12.09-SNAPSHOT CMS edit addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/edit - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/edit - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/edit + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/edit @@ -45,50 +45,50 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT CMS addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-cms - 2.12.08 + 2.12.09-SNAPSHOT CMS root addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/root - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/root - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/cms/root + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/cms/root @@ -45,24 +45,24 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.08 + 2.12.09-SNAPSHOT Defaultcontent frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/defaultcontent/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/defaultcontent/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/defaultcontent/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Default content addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/defaultcontent/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent - 2.12.08 + 2.12.09-SNAPSHOT Defaultcontent repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-repository-utilities - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Eavesdrop @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/eavesdrop - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/eavesdrop - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/eavesdrop + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/eavesdrop @@ -49,27 +49,27 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM editor common addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/common org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM editor frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/frontend @@ -47,46 +47,46 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Editor addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-editor - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM editor repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/repository @@ -42,22 +42,22 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.08 + 2.12.09-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM editor test addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/editor/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/editor/test @@ -50,60 +50,60 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine-test - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.08 + 2.12.09-SNAPSHOT Faceted date frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Faceted date addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-faceteddate - 2.12.08 + 2.12.09-SNAPSHOT Faceted date repository addon @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/faceteddate/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/faceteddate/repository org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided @@ -61,19 +61,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.08 + 2.12.09-SNAPSHOT Gallery common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.08 + 2.12.09-SNAPSHOT Gallery frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/frontend @@ -42,39 +42,39 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Gallery Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-gallery - 2.12.08 + 2.12.09-SNAPSHOT Gallery Addon @@ -28,21 +28,21 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gallery/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gallery/repository org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08 + 2.12.09-SNAPSHOT javax.jcr Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Goto frontend addon @@ -27,16 +27,16 @@ hippo-ecm-addon-gotolink - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gotolink - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gotolink - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/gotolink + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/gotolink org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided @@ -47,7 +47,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Ldap Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-ldap - 2.12.08 + 2.12.09-SNAPSHOT Ldap Addon Repository @@ -35,13 +35,13 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT provided @@ -53,9 +53,9 @@ - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/ldap/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/ldap/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Addons @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.08 + 2.12.09-SNAPSHOT Reporting frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/frontend @@ -42,13 +42,13 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Reporting addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reporting - 2.12.08 + 2.12.09-SNAPSHOT Reporting repository addon @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reporting/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reporting/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08 + 2.12.09-SNAPSHOT Reviewed action common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/common @@ -42,12 +42,12 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08 + 2.12.09-SNAPSHOT Reviewed action frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/frontend @@ -42,44 +42,44 @@ org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Reviewed action addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08 + 2.12.09-SNAPSHOT Reviewed action repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/repository @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-reviewed-action - 2.12.08 + 2.12.09-SNAPSHOT Reviewed action addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/reviewed-action/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/reviewed-action/test @@ -51,49 +51,49 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-package-auth - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT test @@ -104,7 +104,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08 + 2.12.09-SNAPSHOT Sample common addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/common - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/common - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/common + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/common @@ -42,7 +42,7 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT javax.jdo Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08 + 2.12.09-SNAPSHOT Sample frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/frontend @@ -42,17 +42,17 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-sample-common - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Sample addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08 + 2.12.09-SNAPSHOT Sample repository addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/repository @@ -43,17 +43,17 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-sample-common - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-sample - 2.12.08 + 2.12.09-SNAPSHOT Sample addon tests @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/sample/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/sample/test @@ -51,31 +51,31 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-common - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-frontend - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-sample-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-search - 2.12.08 + 2.12.09-SNAPSHOT Search frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/frontend @@ -42,24 +42,24 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Search Addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/search + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/search Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon-standards - 2.12.08 + 2.12.09-SNAPSHOT Standards frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/frontend @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided @@ -60,13 +60,13 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Standards addon @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/standards + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/standards Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Versioning frontend addon @@ -27,9 +27,9 @@ hippo-ecm-addon-versioning - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/versioning - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/versioning - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/versioning + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/versioning @@ -41,30 +41,30 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Workflow @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/workflow - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/workflow - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/workflow + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/workflow @@ -49,26 +49,26 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT jar provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Xinha addon @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT Xinha addon frontend plugin @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha-frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha-frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/xinha-frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/xinha-frontend @@ -45,19 +45,19 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT hippo @@ -73,20 +73,20 @@ org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-addon - 2.12.08 + 2.12.09-SNAPSHOT YUI frontend addon @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/yui - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/yui - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/addon/yui + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/addon/yui @@ -49,7 +49,7 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT API @@ -27,9 +27,9 @@ hippo-ecm-api - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/api - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/api - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/api + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/api Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-archetypes - 2.12.08 + 2.12.09-SNAPSHOT Addon archetype @@ -28,9 +28,9 @@ maven-archetype - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes/addon - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes/addon - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes/addon + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/addon Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Archetypes @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/archetypes + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/archetypes Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08 + 2.12.09-SNAPSHOT Minimal frontend app @@ -28,21 +28,21 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/application org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08 + 2.12.09-SNAPSHOT Frontend engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/engine @@ -58,19 +58,19 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-repository-connector - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.apache.wicket Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08 + 2.12.09-SNAPSHOT Frontend plugins @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/plugins - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/plugins - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/plugins + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/plugins @@ -50,22 +50,22 @@ org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-tools-projectexport - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-yui - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Frontend @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-frontend - 2.12.08 + 2.12.09-SNAPSHOT Frontend engine test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/frontend/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/frontend/test @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided @@ -53,19 +53,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM authorisation configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/auth - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/auth - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/auth + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/auth Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM package configuration @@ -28,8 +28,8 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/config - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/config - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/config + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/config Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM EAR package @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08 + 2.12.09-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08 + 2.12.09-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.08 + 2.12.09-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM CMS layout @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/layout - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/layout - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/layout + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/layout Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM package @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package + https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM package skin @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/skin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/skin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/skin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/skin Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM package test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/test @@ -48,34 +48,34 @@ org.hippoecm hippo-ecm-package-war - 2.12.08 + 2.12.09-SNAPSHOT war test org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-package-ear - 2.12.08 + 2.12.09-SNAPSHOT ear test org.hippoecm hippo-ecm-quickstart-ear - 2.12.08 + 2.12.09-SNAPSHOT ear test org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-package - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM WAR package @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/package/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/package/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08 + 2.12.09-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08 + 2.12.09-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.08 + 2.12.09-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -98,19 +98,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -118,7 +118,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -134,19 +134,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -154,13 +154,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -168,19 +168,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -188,13 +188,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -202,31 +202,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -234,19 +234,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -254,14 +254,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -17,7 +17,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM The core of Hippo ECM, i.e. repository 2, plus an advanced webbased userinterface for content management: CMS, @@ -92,9 +92,9 @@ This is used by normal plugins, but also to autogenerate documentation in .../target/site/source-repository.html --> - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM BIN quickstart @@ -28,16 +28,16 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/bin - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/bin - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/bin + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/bin org.hippoecm hippo-ecm-quickstart-war - 2.12.08 + 2.12.09-SNAPSHOT war Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM EAR quickstart @@ -28,9 +28,9 @@ ear - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/ear - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/ear - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/ear + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/ear @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08 + 2.12.09-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08 + 2.12.09-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.08 + 2.12.09-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -285,7 +285,7 @@ org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08 + 2.12.09-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM quickstart @@ -28,9 +28,9 @@ pom - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart - https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart + https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-quickstart - 2.12.08 + 2.12.09-SNAPSHOT Hippo ECM WAR quickstart @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/war - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/war - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/quickstart/war + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/quickstart/war @@ -38,13 +38,13 @@ org.hippoecm hippo-ecm-addon-xinha - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -52,7 +52,7 @@ org.hippoecm hippo-ecm-package-skin - 2.12.08 + 2.12.09-SNAPSHOT war @@ -60,7 +60,7 @@ org.hippoecm hippo-ecm-package-layout - 2.12.08 + 2.12.09-SNAPSHOT war @@ -68,13 +68,13 @@ org.hippoecm hippo-ecm-repository-application - 2.12.08 + 2.12.09-SNAPSHOT war org.hippoecm hippo-ecm-frontend-application - 2.12.08 + 2.12.09-SNAPSHOT war @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-package-auth - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -90,7 +90,7 @@ org.hippoecm hippo-ecm-package-config - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -98,7 +98,7 @@ org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -106,19 +106,19 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -126,7 +126,7 @@ org.hippoecm hippo-ecm-addon-versioning - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -134,7 +134,7 @@ org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -142,7 +142,7 @@ org.hippoecm hippo-ecm-addon-gotolink - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -150,19 +150,19 @@ org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -170,13 +170,13 @@ org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -184,19 +184,19 @@ org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -204,13 +204,13 @@ org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -218,31 +218,31 @@ org.hippoecm hippo-ecm-addon-cms-root - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -250,19 +250,19 @@ org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -270,14 +270,14 @@ org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -285,13 +285,13 @@ org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.08 + 2.12.09-SNAPSHOT jar org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08 + 2.12.09-SNAPSHOT jar @@ -346,19 +346,19 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Minimal repository app @@ -28,9 +28,9 @@ war - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/application - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/application - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/application + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/application @@ -46,17 +46,17 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-upgrade - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT commons-lang @@ -72,7 +72,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT jar test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Repository connector @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/connector - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/connector - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/connector + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/connector @@ -53,7 +53,7 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.slf4j @@ -82,7 +82,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Repository engine @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/engine - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/engine - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/engine + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine @@ -69,22 +69,22 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-connector - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-modules - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.08 + 2.12.09-SNAPSHOT org.apache.lucene @@ -99,7 +99,7 @@ org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT @@ -112,7 +112,7 @@ org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Repository JCA @@ -27,9 +27,9 @@ hippo-ecm-repository-jca rar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/jca - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/jca - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/jca + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/jca package @@ -153,182 +153,182 @@ org.hippoecm hippo-ecm-addon-xinha-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-package-auth - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-package-config - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-ldap-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-versioning - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-standards-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-gotolink - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reviewed-action-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-faceteddate-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-faceteddate-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-reporting-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-root - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-dashboard - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-edit - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-cms-admin - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-common - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-gallery-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-search-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-workflow - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-defaultcontent-frontend - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-defaultcontent-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-frontend-plugins - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Repository modules @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/modules - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/modules - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/modules + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/modules @@ -51,12 +51,12 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.08 + 2.12.09-SNAPSHOT org.slf4j Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Repository @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Repository test @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/test - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/test - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/test + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/test @@ -45,14 +45,14 @@ org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test @@ -76,13 +76,13 @@ org.hippoecm hippo-ecm-addon-builtin-repository test - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT test @@ -126,13 +126,13 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-addon-builtin-test - 2.12.08 + 2.12.09-SNAPSHOT jar Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/upgrade/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Repository upgrade module @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08 + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx @@ -45,13 +45,13 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-repository-utilities - 2.12.08 + 2.12.09-SNAPSHOT Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-repository - 2.12.08 + 2.12.09-SNAPSHOT Repository Generic JCR Utilities @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/utilities - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/utilities - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/repository/utilities + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/utilities @@ -45,7 +45,7 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/development-content - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/development-content - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/development-content + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/development-content @@ -45,48 +45,48 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-frontend-plugins - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-common - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-builtin-frontend - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-editor-frontend - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-addon-cms-browse - 2.12.08 + 2.12.09-SNAPSHOT provided Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm @@ -28,9 +28,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/documentation - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/documentation - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/documentation + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/documentation Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08 + 2.12.09-SNAPSHOT hippo-ecm-tools-eclipse @@ -36,9 +36,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/eclipse - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/eclipse - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/eclipse + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/eclipse Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm - 2.12.08 + 2.12.09-SNAPSHOT Tools @@ -28,9 +28,9 @@ pom - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm @@ -28,52 +28,52 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/projectexport - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/projectexport - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/projectexport + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/projectexport org.hippoecm hippo-ecm-addon-gallery-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-builtin-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-editor-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-package-config - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-addon-reporting-repository - 2.12.08 + 2.12.09-SNAPSHOT test org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT provided org.hippoecm hippo-ecm-tools-testutils - 2.12.08 + 2.12.09-SNAPSHOT test @@ -90,22 +90,22 @@ org.hippoecm hippo-ecm-api - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-frontend-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-engine - 2.12.08 + 2.12.09-SNAPSHOT org.hippoecm hippo-ecm-repository-utilities - 2.12.08 + 2.12.09-SNAPSHOT com.atomikos Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-19 14:26:59 UTC (rev 22185) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils/pom.xml 2010-03-19 14:27:11 UTC (rev 22186) @@ -18,7 +18,7 @@ org.hippoecm hippo-ecm-tools - 2.12.08 + 2.12.09-SNAPSHOT Test utilities @@ -29,9 +29,9 @@ jar - scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/testutils - scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/testutils - http://svn.onehippo.org/repos/hippo/hippo-ecm/tags/Tag-HREPTWO-v2_12_08/tools/testutils + scm:svn:http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + scm:svn:https://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils + http://svn.onehippo.org/repos/hippo/hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/tools/testutils From helpdesk at onehippo.com Fri Mar 19 15:29:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 19 15:34:41 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3988) AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue In-Reply-To: <19204269.7779.1268919828493.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <6915556.8708.1269008988754.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3988?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3988: ---------------------------------------- Fix Version/s: r2.12.09 (was: r2.12.08) > AbstractValueMap.getAsBoolean(key, defaultValue) always returns false for non-existing keys, instead of defaultValue > -------------------------------------------------------------------------------------------------------------------- > > Key: HREPTWO-3988 > URL: http://issues.onehippo.com/browse/HREPTWO-3988 > Project: Hippo Repository 2 > Issue Type: Bug > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Fix For: r2.12.09, r2.13.00 > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 15:29:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 19 15:34:47 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3977) UnitTest for JCRValueList In-Reply-To: <16788608.5841.1268738028543.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <12882815.8712.1269008988859.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3977?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3977: ---------------------------------------- Fix Version/s: r2.12.09 (was: r2.12.08) > UnitTest for JCRValueList > ------------------------- > > Key: HREPTWO-3977 > URL: http://issues.onehippo.com/browse/HREPTWO-3977 > Project: Hippo Repository 2 > Issue Type: Task > Affects Versions: r2.12.08, r2.13.00 > Reporter: Vijay Kiran > Assignee: Vijay Kiran > Fix For: r2.12.09, r2.13.00 > > > There's no corresponding unit test for org.hippoecm.frontend.model.map.JcrValueList -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 15:29:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 19 15:34:53 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3901) Picture disappears from the resource primitive field after first use In-Reply-To: <25164435.3299.1267200890443.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <2525066.8715.1269008988903.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3901?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3901: ---------------------------------------- Fix Version/s: r2.12.09 (was: r2.12.08) > Picture disappears from the resource primitive field after first use > -------------------------------------------------------------------- > > Key: HREPTWO-3901 > URL: http://issues.onehippo.com/browse/HREPTWO-3901 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.05 > Environment: WinXP SP3 > Fx 3.6 > IE 7 > IE 8 > Sun JDK 1.6.0_18 > Hippo CMS version 2.12.05 > (Hippo Repository 2.12.05) > Reporter: Sylvain P?lissier > Assignee: Arthur Bogaart > Fix For: r2.12.09, r2.13.00 > > Attachments: screenshot.png > > > The resource primitive from the quickstart has a graphics on it, some blue boxes. It remains visible on a document type, as well as on a document. It disappears after one pushes the Upload button and is replaced with information about the file. > See screenshot. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 15:29:48 2010 From: helpdesk at onehippo.com (JIRA (Berry van Halderen)) Date: Fri Mar 19 15:34:57 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3978) Deadlock in version storage - VersionManagerImpl In-Reply-To: <28596032.5996.1268746908566.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <21909768.8710.1269008988791.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3978?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Berry van Halderen updated HREPTWO-3978: ---------------------------------------- Fix Version/s: r2.12.09 (was: r2.12.08) > Deadlock in version storage - VersionManagerImpl > ------------------------------------------------ > > Key: HREPTWO-3978 > URL: http://issues.onehippo.com/browse/HREPTWO-3978 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.06 > Reporter: Jettro Coenradie > Assignee: Berry van Halderen > Priority: Blocker > Fix For: r2.12.09, r2.13.00 > > > During concurrent cms usage we encountered a deadlock situation. The following output was obtained using a kill -3 on the tomcat server > "TP-Processor5" daemon prio=10 tid=0x00007ff076f43000 nid=0x48a3 waiting for monitor entry [0x000000004354a000] > java.lang.Thread.State: BLOCKED (on object monitor) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:565) > - waiting to lock <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff09b34eb80> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:232) > at org.hippoecm.repository.standardworkflow.FolderWorkflowImpl.add(FolderWorkflowImpl.java:161) > at sun.reflect.GeneratedMethodAccessor89.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff09b44a230> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy6.add(Unknown Source) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:263) > at org.hippoecm.frontend.plugins.standardworkflow.FolderWorkflowPlugin$4.execute(FolderWorkflowPlugin.java:237) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.onOk(CompatibilityWorkflowPlugin.java:200) > at org.hippoecm.frontend.dialog.AbstractDialog.handleSubmit(AbstractDialog.java:526) > at org.hippoecm.frontend.dialog.AbstractDialog$2.onSubmit(AbstractDialog.java:395) > at org.hippoecm.frontend.dialog.AbstractDialog$ButtonWrapper$1.onSubmit(AbstractDialog.java:265) > at org.apache.wicket.ajax.markup.html.form.AjaxButton$1.onSubmit(AjaxButton.java:102) > at org.apache.wicket.ajax.form.AjaxFormSubmitBehavior.onEvent(AjaxFormSubmitBehavior.java:143) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-50" daemon prio=10 tid=0x00007ff068245000 nid=0x4635 in Object.wait() [0x0000000047188000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d94a8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-49" daemon prio=10 tid=0x00007ff068c37000 nid=0x4634 in Object.wait() [0x0000000047087000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d67b0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-48" daemon prio=10 tid=0x00007ff068c35000 nid=0x4633 in Object.wait() [0x0000000046f86000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9850> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-47" daemon prio=10 tid=0x00007ff068ceb800 nid=0x4632 in Object.wait() [0x0000000046e85000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6af8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-46" daemon prio=10 tid=0x00007ff068cea000 nid=0x4631 in Object.wait() [0x0000000046d84000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d6eb0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-45" daemon prio=10 tid=0x00007ff068dcc000 nid=0x4630 in Object.wait() [0x0000000046c83000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9c08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-44" daemon prio=10 tid=0x00007ff0683ee000 nid=0x462f in Object.wait() [0x0000000046b82000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837d9e28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-43" daemon prio=10 tid=0x00007ff0683ec000 nid=0x462e in Object.wait() [0x0000000046a81000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-42" daemon prio=10 tid=0x00007ff068c04800 nid=0x462d in Object.wait() [0x0000000046980000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e04c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-41" daemon prio=10 tid=0x00007ff068ab5800 nid=0x462c in Object.wait() [0x000000004687f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e27f0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-40" daemon prio=10 tid=0x00007ff068ab3800 nid=0x462b in Object.wait() [0x000000004677e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-39" daemon prio=10 tid=0x00007ff068dc9000 nid=0x462a in Object.wait() [0x000000004667d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2b38> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-38" daemon prio=10 tid=0x00007ff0699b2800 nid=0x4629 in Object.wait() [0x000000004657c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e2d58> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-37" daemon prio=10 tid=0x00007ff068c38800 nid=0x4628 in Object.wait() [0x000000004647b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0bc0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-36" daemon prio=10 tid=0x00007ff069a98800 nid=0x4627 in Object.wait() [0x000000004637a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e30a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-35" daemon prio=10 tid=0x00007ff0680a7000 nid=0x4626 in Object.wait() [0x0000000046279000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e0f08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-34" daemon prio=10 tid=0x00007ff068ce8800 nid=0x4625 in Object.wait() [0x0000000046178000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3458> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-33" daemon prio=10 tid=0x00007ff06951e800 nid=0x4624 in Object.wait() [0x0000000046077000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1250> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-32" daemon prio=10 tid=0x00007ff06d6f6000 nid=0x4623 in Object.wait() [0x0000000045f76000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e37d8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-31" daemon prio=10 tid=0x00007ff06d6f4000 nid=0x4622 in Object.wait() [0x0000000045e75000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1608> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-30" daemon prio=10 tid=0x00007ff06c1a9000 nid=0x4621 in Object.wait() [0x0000000045d74000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3b20> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-29" daemon prio=10 tid=0x00007ff06c1a7000 nid=0x4620 in Object.wait() [0x0000000045c73000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374def8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-28" daemon prio=10 tid=0x00007ff06c1a5000 nid=0x461f in Object.wait() [0x0000000045b72000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e240> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-27" daemon prio=10 tid=0x00007ff06c1a3000 nid=0x461e in Object.wait() [0x0000000045a71000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e588> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-26" daemon prio=10 tid=0x00007ff06c1a2800 nid=0x461d in Object.wait() [0x0000000045970000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374e940> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-25" daemon prio=10 tid=0x00007ff06c0c0800 nid=0x461c in Object.wait() [0x000000004586f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374eb60> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-24" daemon prio=10 tid=0x00007ff06c0c0000 nid=0x461b in Object.wait() [0x000000004576e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374ee70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-23" daemon prio=10 tid=0x00007ff06d846000 nid=0x461a in Object.wait() [0x000000004566d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f1b8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-22" daemon prio=10 tid=0x00007ff06c3f5800 nid=0x4619 in Object.wait() [0x000000004556c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff08374f500> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-21" daemon prio=10 tid=0x00007ff06c3f3800 nid=0x4618 in Object.wait() [0x000000004546b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e52d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-20" daemon prio=10 tid=0x00007ff06d844800 nid=0x4617 in Object.wait() [0x000000004536a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5618> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-19" daemon prio=10 tid=0x00007ff06d842800 nid=0x4616 in Object.wait() [0x0000000045269000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5960> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-18" daemon prio=10 tid=0x00007ff06d840800 nid=0x4615 in Object.wait() [0x0000000045168000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e5d50> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-17" daemon prio=10 tid=0x00007ff06c196800 nid=0x4614 in Object.wait() [0x0000000045067000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6108> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-16" daemon prio=10 tid=0x00007ff06c194800 nid=0x4613 in Object.wait() [0x0000000044f66000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e1950> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-15" daemon prio=10 tid=0x00007ff06c193000 nid=0x4612 in Object.wait() [0x0000000044e65000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e64c0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-14" daemon prio=10 tid=0x00007ff06c191000 nid=0x4611 in Object.wait() [0x0000000044d64000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6878> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-13" daemon prio=10 tid=0x00007ff06db01800 nid=0x4610 in Object.wait() [0x0000000044c63000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e81e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-12" daemon prio=10 tid=0x00007ff06daff800 nid=0x460f in Object.wait() [0x0000000044b62000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e85a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-11" daemon prio=10 tid=0x00007ff06dafd800 nid=0x460e in Object.wait() [0x0000000044a61000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e88e8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-10" daemon prio=10 tid=0x00007ff06dafc000 nid=0x460d in Object.wait() [0x0000000044960000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8b08> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-9" daemon prio=10 tid=0x00007ff06c097000 nid=0x460c in Object.wait() [0x000000004485f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e8ef8> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-8" daemon prio=10 tid=0x00007ff06c095000 nid=0x460b in Object.wait() [0x000000004475e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6c98> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-7" daemon prio=10 tid=0x00007ff06c093000 nid=0x460a in Object.wait() [0x000000004465d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e9558> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-6" daemon prio=10 tid=0x00007ff06c091000 nid=0x4609 in Object.wait() [0x000000004455c000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e6d70> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-5" daemon prio=10 tid=0x00007ff06c010800 nid=0x4608 in Object.wait() [0x000000004445b000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e98a0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-4" daemon prio=10 tid=0x00007ff06c00e800 nid=0x4607 in Object.wait() [0x000000004435a000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eae28> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-3" daemon prio=10 tid=0x00007ff06c015000 nid=0x4606 in Object.wait() [0x0000000044259000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb218> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-2" daemon prio=10 tid=0x00007ff06d7bd000 nid=0x4605 in Object.wait() [0x0000000044158000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837eb5d0> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-1" daemon prio=10 tid=0x00007ff06d7bc000 nid=0x4604 in Object.wait() [0x0000000044057000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:423) > - locked <0x00007ff0837e3e68> (a org.apache.tomcat.util.net.JIoEndpoint$Worker) > at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:449) > at java.lang.Thread.run(Thread.java:619) > "http-10.2.16.20-8444-Acceptor-0" daemon prio=10 tid=0x00007ff06d7b9800 nid=0x4603 runnable [0x0000000043f56000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e2b3660> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Admin]]" daemon prio=10 tid=0x00007ff06d7af800 nid=0x4602 waiting on condition [0x0000000043e55000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "TP-Monitor" daemon prio=10 tid=0x00007ff06e29c000 nid=0x4601 in Object.wait() [0x0000000043d54000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565) > - locked <0x00007ff08372be60> (a org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor4" daemon prio=10 tid=0x00007ff06c293000 nid=0x4600 runnable [0x0000000043c53000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836e14c8> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:307) > at org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:661) > at org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:872) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor3" daemon prio=10 tid=0x00007ff06c0e4000 nid=0x45ff in Object.wait() [0x0000000043b50000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.applyAppender(EventLoggerImpl.java:190) > at org.hippoecm.repository.standardworkflow.EventLoggerImpl.logEvent(EventLoggerImpl.java:141) > at sun.reflect.GeneratedMethodAccessor73.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:496) > - locked <0x00007ff1592dc900> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy1.logEvent(Unknown Source) > at org.hippoecm.frontend.model.JcrSessionModel.load(JcrSessionModel.java:135) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:143) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor2" daemon prio=10 tid=0x00007ff06c0e8800 nid=0x45fe in Object.wait() [0x0000000043a4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.apache.jackrabbit.core.version.AbstractVersionManager$WriteOperation.save(AbstractVersionManager.java:150) > at org.apache.jackrabbit.core.version.AbstractVersionManager.createVersionHistory(AbstractVersionManager.java:317) > at org.apache.jackrabbit.core.version.VersionManagerImpl$1.run(VersionManagerImpl.java:220) > at org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory.doSourced(VersionManagerImpl.java:567) > - locked <0x00007ff07e9b9c50> (a org.apache.jackrabbit.core.version.VersionManagerImpl$DynamicESCFactory) > at org.apache.jackrabbit.core.version.VersionManagerImpl.createVersionHistory(VersionManagerImpl.java:217) > at org.apache.jackrabbit.core.version.XAVersionManager.createVersionHistory(XAVersionManager.java:156) > at org.apache.jackrabbit.core.version.AbstractVersionManager.getVersionHistory(AbstractVersionManager.java:234) > at org.apache.jackrabbit.core.ItemImpl.initVersionHistories(ItemImpl.java:727) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1080) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:499) > - locked <0x00007ff0a758ea10> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at $Proxy3.obtainEditableInstance(Unknown Source) > at org.hippoecm.frontend.plugins.reviewedactions.FullReviewedActionsWorkflowPlugin$3.execute(FullReviewedActionsWorkflowPlugin.java:137) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:142) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.invoke(CompatibilityWorkflowPlugin.java:132) > at org.hippoecm.addon.workflow.MenuAction$1.onClick(MenuAction.java:43) > at org.hippoecm.addon.workflow.MenuLink.onClick(MenuLink.java:50) > at org.apache.wicket.ajax.markup.html.AjaxLink$1.onEvent(AjaxLink.java:68) > at org.apache.wicket.ajax.AjaxEventBehavior.respond(AjaxEventBehavior.java:177) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doGet(WicketServlet.java:138) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "TP-Processor1" daemon prio=10 tid=0x00007ff06daa9000 nid=0x45fd in Object.wait() [0x0000000042237000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc98> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$WriterLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.lockAndSync(AbstractJournal.java:250) > at org.apache.jackrabbit.core.journal.DefaultRecordProducer.append(DefaultRecordProducer.java:51) > at org.apache.jackrabbit.core.cluster.ClusterNode$WorkspaceUpdateChannel.updateCreated(ClusterNode.java:586) > at org.apache.jackrabbit.core.state.SharedItemStateManager$Update.begin(SharedItemStateManager.java:549) > at org.apache.jackrabbit.core.state.SharedItemStateManager.beginUpdate(SharedItemStateManager.java:1071) > at org.apache.jackrabbit.core.state.SharedItemStateManager.update(SharedItemStateManager.java:1101) > at org.hippoecm.repository.jackrabbit.HippoSharedItemStateManager.update(HippoSharedItemStateManager.java:59) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:351) > at org.apache.jackrabbit.core.state.ForkedXAItemStateManager.update(ForkedXAItemStateManager.java:360) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:228) > at org.apache.jackrabbit.core.state.LocalItemStateManager.update(LocalItemStateManager.java:326) > at org.hippoecm.repository.jackrabbit.HippoLocalItemStateManager.update(HippoLocalItemStateManager.java:236) > at org.apache.jackrabbit.core.state.SessionItemStateManager.update(SessionItemStateManager.java:313) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1103) > - locked <0x00007ff0bdd8c778> (a org.hippoecm.repository.jackrabbit.XASessionImpl) > at org.hippoecm.repository.decorating.ItemDecorator.save(ItemDecorator.java:144) > at org.hippoecm.repository.impl.NodeDecorator.save(NodeDecorator.java:84) > at org.hippoecm.repository.decorating.checked.ItemDecorator.save(ItemDecorator.java:173) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:176) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm$2.load(RememberMeLoginPlugin.java:124) > at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:122) > at org.hippoecm.frontend.session.UserSession.login(UserSession.java:194) > at org.hippoecm.frontend.plugins.login.RememberMeLoginPlugin$SignInForm.onSubmit(RememberMeLoginPlugin.java:197) > at org.apache.wicket.markup.html.form.Form.delegateSubmit(Form.java:1518) > at org.apache.wicket.markup.html.form.Form.process(Form.java:914) > at org.apache.wicket.markup.html.form.Form.onFormSubmitted(Form.java:876) > at sun.reflect.GeneratedMethodAccessor72.invoke(Unknown Source) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.wicket.RequestListenerInterface.invoke(RequestListenerInterface.java:182) > at org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget.processEvents(ListenerInterfaceRequestTarget.java:73) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketServlet.doPost(WicketServlet.java:160) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:637) > at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) > at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > 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:293) > at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) > at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) > at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) > at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) > at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891) > at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690) > at java.lang.Thread.run(Thread.java:619) > "http-8080-Acceptor-0" daemon prio=10 tid=0x00007ff06c0ee000 nid=0x45fc runnable [0x000000004253c000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff07e28cd70> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61) > at org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:317) > at java.lang.Thread.run(Thread.java:619) > "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x00007ff06c0eb000 nid=0x45fb waiting on condition [0x0000000042e45000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-1099" daemon prio=10 tid=0x00007ff077047800 nid=0x45f7 runnable [0x000000004233a000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff083319458> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "GC Daemon" daemon prio=10 tid=0x00007ff077a11800 nid=0x45f3 in Object.wait() [0x000000004273e000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at sun.misc.GC$Daemon.run(GC.java:100) > - locked <0x00007ff0837e6f90> (a sun.misc.GC$LatencyLock) > "RMI Reaper" prio=10 tid=0x00007ff075853800 nid=0x45f2 in Object.wait() [0x0000000041c4f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff0837e71a8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at sun.rmi.transport.ObjectTable$Reaper.run(ObjectTable.java:333) > at java.lang.Thread.run(Thread.java:619) > "RMI TCP Accept-0" daemon prio=10 tid=0x00007ff077334800 nid=0x45f1 runnable [0x000000004187e000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff08331a5e0> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.executeAcceptLoop(TCPTransport.java:369) > at sun.rmi.transport.tcp.TCPTransport$AcceptLoop.run(TCPTransport.java:341) > at java.lang.Thread.run(Thread.java:619) > "HJCRQJS_QuartzSchedulerThread" prio=10 tid=0x00007ff068ce7000 nid=0x45f0 sleeping[0x0000000041b4e000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.quartz.core.QuartzSchedulerThread.run(QuartzSchedulerThread.java:394) > "HJCRQJS_Worker-0" prio=10 tid=0x00007ff068394000 nid=0x45ef in Object.wait() [0x0000000043950000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at org.quartz.simpl.SimpleThreadPool.getNextRunnable(SimpleThreadPool.java:428) > - locked <0x00007ff082e75448> (a java.lang.Object) > at org.quartz.simpl.SimpleThreadPool.access$000(SimpleThreadPool.java:47) > at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:518) > "RefreshingEventListener" prio=10 tid=0x00007ff068a96000 nid=0x45ee waiting on condition [0x000000004384f000] > java.lang.Thread.State: TIMED_WAITING (sleeping) > at java.lang.Thread.sleep(Native Method) > at org.hippoecm.repository.RefreshingEventListener$1.run(RefreshingEventListener.java:96) > "ClusterNode-s1720" daemon prio=10 tid=0x00007ff070794800 nid=0x334c in Object.wait() [0x000000004374e000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock.acquire(Unknown Source) > - locked <0x00007ff07e8bbc78> (a EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock$ReaderLock) > at org.apache.jackrabbit.core.journal.AbstractJournal.sync(AbstractJournal.java:182) > at org.apache.jackrabbit.core.cluster.ClusterNode.sync(ClusterNode.java:315) > at org.apache.jackrabbit.core.cluster.ClusterNode.run(ClusterNode.java:286) > at java.lang.Thread.run(Thread.java:619) > "IndexMerger" daemon prio=10 tid=0x00007ff06c05f800 nid=0x7271 in Object.wait() [0x000000004263d000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff0813e2858> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "Timer-0" daemon prio=10 tid=0x00007ff06c001000 nid=0x7266 in Object.wait() [0x0000000041594000] > java.lang.Thread.State: TIMED_WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.util.TimerThread.mainLoop(Timer.java:509) > - locked <0x00007ff080de49d0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "IndexMerger" daemon prio=10 tid=0x00007ff07794c800 nid=0x7265 in Object.wait() [0x00000000412be000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07f40c0d8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.query.lucene.IndexMerger.run(IndexMerger.java:263) > "ObservationManager" daemon prio=10 tid=0x00007ff077076800 nid=0x724d in Object.wait() [0x000000004067f000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at org.apache.commons.collections.buffer.BlockingBuffer.remove(BlockingBuffer.java:107) > - locked <0x00007ff07eadd8f8> (a org.apache.commons.collections.buffer.BlockingBuffer) > at org.apache.jackrabbit.core.observation.ObservationDispatcher.run(ObservationDispatcher.java:138) > at java.lang.Thread.run(Thread.java:619) > "Transient File Reaper" daemon prio=10 tid=0x00007ff07041e800 nid=0x724c in Object.wait() [0x0000000040a39000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e6b3c98> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at org.apache.jackrabbit.util.TransientFileFactory$ReaperThread.run(TransientFileFactory.java:188) > "MySQL Statement Cancellation Timer" daemon prio=10 tid=0x00007ff070483000 nid=0x724b in Object.wait() [0x00000000411bd000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > - waiting on <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.lang.Object.wait(Object.java:485) > at java.util.TimerThread.mainLoop(Timer.java:483) > - locked <0x00007ff07e6accc0> (a java.util.TaskQueue) > at java.util.TimerThread.run(Timer.java:462) > "Low Memory Detector" daemon prio=10 tid=0x00007ff070004000 nid=0x7240 runnable [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread1" daemon prio=10 tid=0x00007ff070001000 nid=0x723f waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "CompilerThread0" daemon prio=10 tid=0x00007ff077aa7800 nid=0x723e waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Signal Dispatcher" daemon prio=10 tid=0x00007ff077aa5800 nid=0x723d waiting on condition [0x0000000000000000] > java.lang.Thread.State: RUNNABLE > "Finalizer" daemon prio=10 tid=0x00007ff077f29800 nid=0x723a in Object.wait() [0x0000000042138000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118) > - locked <0x00007ff07e214fe8> (a java.lang.ref.ReferenceQueue$Lock) > at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134) > at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159) > "Reference Handler" daemon prio=10 tid=0x00007ff077f22000 nid=0x7239 in Object.wait() [0x0000000040fbb000] > java.lang.Thread.State: WAITING (on object monitor) > at java.lang.Object.wait(Native Method) > at java.lang.Object.wait(Object.java:485) > at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116) > - locked <0x00007ff07e214fb0> (a java.lang.ref.Reference$Lock) > "main" prio=10 tid=0x0000000040113800 nid=0x722e runnable [0x0000000040836000] > java.lang.Thread.State: RUNNABLE > at java.net.PlainSocketImpl.socketAccept(Native Method) > at java.net.PlainSocketImpl.accept(PlainSocketImpl.java:390) > - locked <0x00007ff0836f5d60> (a java.net.SocksSocketImpl) > at java.net.ServerSocket.implAccept(ServerSocket.java:453) > at java.net.ServerSocket.accept(ServerSocket.java:421) > at org.apache.catalina.core.StandardServer.await(StandardServer.java:389) > at org.apache.catalina.startup.Catalina.await(Catalina.java:647) > at org.apache.catalina.startup.Catalina.start(Catalina.java:607) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) > at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) > "VM Thread" prio=10 tid=0x00007ff077f1b000 nid=0x7237 runnable > "GC task thread#0 (ParallelGC)" prio=10 tid=0x000000004011d800 nid=0x722f runnable > "GC task thread#1 (ParallelGC)" prio=10 tid=0x000000004011f800 nid=0x7230 runnable > "GC task thread#2 (ParallelGC)" prio=10 tid=0x0000000040121800 nid=0x7231 runnable > "GC task thread#3 (ParallelGC)" prio=10 tid=0x0000000040123000 nid=0x7232 runnable > "GC task thread#4 (ParallelGC)" prio=10 tid=0x0000000040125000 nid=0x7233 runnable > "GC task thread#5 (ParallelGC)" prio=10 tid=0x0000000040127000 nid=0x7234 runnable > "GC task thread#6 (ParallelGC)" prio=10 tid=0x0000000040128800 nid=0x7235 runnable > "GC task thread#7 (ParallelGC)" prio=10 tid=0x000000004012a800 nid=0x7236 runnable > "VM Periodic Task Thread" prio=10 tid=0x00007ff070007000 nid=0x7241 waiting on condition > JNI global references: 1147 > Heap > PSYoungGen total 670528K, used 301659K [0x00007ff128b90000, 0x00007ff161a80000, 0x00007ff17e0e0000) > eden space 592512K, 37% used [0x00007ff128b90000,0x00007ff136605ee8,0x00007ff14ce30000) > from space 78016K, 99% used [0x00007ff158160000,0x00007ff15cd81020,0x00007ff15cd90000) > to space 78784K, 0% used [0x00007ff15cd90000,0x00007ff15cd90000,0x00007ff161a80000) > PSOldGen total 1465344K, used 1096343K [0x00007ff07e0e0000, 0x00007ff0d77e0000, 0x00007ff128b90000) > object space 1465344K, 74% used [0x00007ff07e0e0000,0x00007ff0c0f85ea0,0x00007ff0d77e0000) > PSPermGen total 54976K, used 54410K [0x00007ff078ce0000, 0x00007ff07c290000, 0x00007ff07e0e0000) > object space 54976K, 98% used [0x00007ff078ce0000,0x00007ff07c2028f0,0x00007ff07c290000) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From schans at onehippo.com Fri Mar 19 17:09:22 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 17:09:19 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_stable_=3A_Hi?= =?utf-8?q?ppo_ECM_Trunk_=C2=BB_Builtin_addon_tests_=231205?= In-Reply-To: <316343.151268998203043.JavaMail.hudson@hudson.onehippo.org> References: <316343.151268998203043.JavaMail.hudson@hudson.onehippo.org> Message-ID: <16725286.181269014962139.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Fri Mar 19 17:09:22 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 17:09:24 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_is_back_to_stable_=3A_Hi?= =?utf-8?q?ppo_ECM_Trunk_=C2=BB_Hippo_ECM_editor_test_addon_=231205?= In-Reply-To: <15183112.161268998203370.JavaMail.hudson@hudson.onehippo.org> References: <15183112.161268998203370.JavaMail.hudson@hudson.onehippo.org> Message-ID: <16410583.191269014962428.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Fri Mar 19 17:09:24 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Fri Mar 19 17:09:30 2010 Subject: [HippoRepos-dev] Hudson build is back to stable : Hippo ECM Trunk #1205 In-Reply-To: <8882254.171268998204845.JavaMail.hudson@hudson.onehippo.org> References: <8882254.171268998204845.JavaMail.hudson@hudson.onehippo.org> Message-ID: <15804660.201269014964315.JavaMail.hudson@hudson.onehippo.org> See From svn-logs at hippocms.org Fri Mar 19 17:10:57 2010 From: svn-logs at hippocms.org (abogaart) Date: Fri Mar 19 17:15:53 2010 Subject: [HippoRepos-dev] [22195] hippo-ecm/trunk: HREPTWO-3982 - Restyle date picker Message-ID: <20100319161057.EAB521C020@svn.vm.castaserver.com> Revision: 22195 Author: abogaart Date: 2010-03-19 17:10:57 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3982 - Restyle date picker - restyled picker - refactored datepicker code Modified Paths: -------------- hippo-ecm/trunk/addon/builtin/common/src/main/java/org/hippoecm/repository/HippoStdNodeType.java hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.html hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.java hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.html hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java hippo-ecm/trunk/package/skin/src/main/webapp/screen.css Added Paths: ----------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties Removed Paths: ------------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.html hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.properties hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField_nl.properties hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/init.js hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/skin.css hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/sprite.png Modified: hippo-ecm/trunk/addon/builtin/common/src/main/java/org/hippoecm/repository/HippoStdNodeType.java =================================================================== --- hippo-ecm/trunk/addon/builtin/common/src/main/java/org/hippoecm/repository/HippoStdNodeType.java 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/builtin/common/src/main/java/org/hippoecm/repository/HippoStdNodeType.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -39,17 +39,19 @@ //--- Hippo Item Names ---// String HIPPOSTD_CONTENT = "hippostd:content"; - String HIPPOSTD_DATE = "hippostd:date"; - String HIPPOSTD_DAYOFYEAR = "hippostd:dayofyear"; String HIPPOSTD_HOLDER = "hippostd:holder"; String HIPPOSTD_LANGUAGE = "hippostd:language"; - String HIPPOSTD_MONTH = "hippostd:month"; String HIPPOSTD_SECOND = "hippostd:second"; String HIPPOSTD_STATE = "hippostd:state"; String HIPPOSTD_STATESUMMARY = "hippostd:stateSummary"; String HIPPOSTD_TRANSLATIONS = "hippostd:translations"; + + String HIPPOSTD_DATE = "hippostd:date"; + String HIPPOSTD_MONTH = "hippostd:month"; + String HIPPOSTD_YEAR = "hippostd:year"; + String HIPPOSTD_DAYOFYEAR = "hippostd:dayofyear"; String HIPPOSTD_WEEKOFYEAR = "hippostd:weekofyear"; - String HIPPOSTD_YEAR = "hippostd:year"; + String HIPPOSTD_DAYOFWEEK = "hippostd:dayofweek"; //--- Hippo Item Values ---// String PUBLISHED = "published"; Modified: hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.html =================================================================== --- hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.html 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.html 2010-03-19 16:10:57 UTC (rev 22195) @@ -15,11 +15,12 @@ --> -

    - -
    - -
    -
    +
    [ Value ]
    + + + [Label] + [Week of year][Day of week][Day of year] + + Modified: hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.java =================================================================== --- hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.java 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/faceteddate/frontend/src/main/java/org/hippoecm/faceteddate/editor/DatePickerPlugin.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -15,16 +15,10 @@ */ package org.hippoecm.faceteddate.editor; -import java.util.Date; - -import javax.jcr.Node; -import javax.jcr.RepositoryException; - -import org.apache.wicket.MarkupContainer; import org.apache.wicket.datetime.StyleDateConverter; import org.apache.wicket.datetime.markup.html.basic.DateLabel; -import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.Model; import org.hippoecm.frontend.i18n.types.TypeTranslator; import org.hippoecm.frontend.model.JcrNodeModel; @@ -38,6 +32,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import java.util.Date; + +import static org.hippoecm.repository.HippoStdNodeType.*; + public class DatePickerPlugin extends RenderPlugin { @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; @@ -49,30 +49,37 @@ public DatePickerPlugin(IPluginContext context, IPluginConfig config) throws RepositoryException { super(context, config); + setOutputMarkupId(true); + Node dateNode = ((JcrNodeModel) getDefaultModel()).getNode(); - JcrPropertyValueModel valueModel = new JcrPropertyValueModel(new JcrPropertyModel(dateNode - .getProperty("hippostd:date"))); - MarkupContainer panel; - add(panel = new WebMarkupContainer("info")); + JcrPropertyValueModel valueModel = new JcrPropertyValueModel( + new JcrPropertyModel(dateNode.getProperty(HIPPOSTD_DATE))); - panel.add(new Label("weekofyear", dateNode.hasProperty("hippostd:weekofyear") ? dateNode.getProperty( - "hippostd:weekofyear").getString() : "-")); - if (dateNode.hasProperty("hippostd:dayofweek")) { - panel.add(new Label("dayofweek", new TypeTranslator(new JcrNodeTypeModel("hippostd:date")).getValueName( - "hippostd:dayofweek", new Model(dateNode.getProperty("hippostd:dayofweek").getString())))); - } else { - panel.add(new Label("dayofweek", "-")); - } - panel.add(new Label("dayofyear", dateNode.hasProperty("hippostd:dayofyear") ? dateNode.getProperty( - "hippostd:dayofyear").getString() : "-")); + String mode = config.getString("mode", "view"); + add("view".equals(mode) ? new View("value", dateNode, valueModel) : new DateFieldWidget("value", + valueModel, context, config)); + } - if ("edit".equals(config.getString("mode", "view"))) { - add(new DateFieldWidget("value", valueModel, context, config)); - panel.setVisible(false); - } else { - add(new DateLabel("value", valueModel, new StyleDateConverter(true))); + class View extends Fragment { + + public View(String id, Node dateNode, JcrPropertyValueModel valueModel) throws RepositoryException { + super(id, "view", DatePickerPlugin.this); + + add(new DateLabel("label", valueModel, new StyleDateConverter(true))); + + String weekOfYear = dateNode.hasProperty(HIPPOSTD_WEEKOFYEAR) ? dateNode.getProperty(HIPPOSTD_WEEKOFYEAR).getString() : "-"; + add(new Label("weekofyear", weekOfYear)); + + if (dateNode.hasProperty(HIPPOSTD_DAYOFWEEK)) { + add(new Label("dayofweek", new TypeTranslator(new JcrNodeTypeModel(HIPPOSTD_DATE)).getValueName( + HIPPOSTD_DAYOFWEEK, new Model(dateNode.getProperty(HIPPOSTD_DAYOFWEEK).getString())))); + } else { + add(new Label("dayofweek", "-")); + } + + String dayOfYear = dateNode.hasProperty(HIPPOSTD_DAYOFYEAR) ? dateNode.getProperty(HIPPOSTD_DAYOFYEAR).getString() : "-"; + add(new Label("dayofyear", dayOfYear)); + } - - setOutputMarkupId(true); } } Modified: hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin.java 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -42,7 +42,7 @@ 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.yui.datetime.AjaxDateTimeField; +import org.hippoecm.frontend.plugins.yui.datetime.YuiDateTimeField; import org.hippoecm.frontend.service.IRenderService; import org.hippoecm.frontend.service.ITranslateService; import org.hippoecm.frontend.service.ServiceTracker; @@ -419,7 +419,7 @@ super(); add(new Label("question", question)); - add(new AjaxDateTimeField("value", dateModel, true, getPluginContext(), getPluginConfig())); + add(new YuiDateTimeField("value", dateModel)); setFocusOnCancel(); } Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.html =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.html 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.html 2010-03-19 16:10:57 UTC (rev 22195) @@ -1,25 +0,0 @@ - - - - - -  : - - -     - - Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.java 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -1,108 +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.yui.datetime; - -import java.util.Date; -import java.util.TimeZone; - -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; -import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.model.IModel; -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.joda.time.DateTimeFieldType; -import org.joda.time.DateTimeZone; -import org.joda.time.MutableDateTime; - -public class AjaxDateTimeField extends DateTimeField { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id: AjaxDateTimeField.java 19048 2009-07-28 16:08:33Z abogaart $"; - - private static final long serialVersionUID = 1L; - - public AjaxDateTimeField(String id, IModel model, boolean todayLinkVisible, IPluginContext context, IPluginConfig config) { - super(id, model, context, config); - - get("date").add(new ChangeBehaviour()); - get("hours").add(new ChangeBehaviour()); - get("minutes").add(new ChangeBehaviour()); - get("amOrPmChoice").add(new ChangeBehaviour()); - - setOutputMarkupId(true); - - add(new AjaxLink("today") { - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - updateDateTime(new Date(), null, null, target); - } - }.setVisible(todayLinkVisible)); - } - - // callback that the ChangeBehaviour calls when one of the composing fields updates - public void onUpdate(AjaxRequestTarget target) { - Object dateFieldInput = get("date").getDefaultModelObject(); - Integer hours = (Integer) get("hours").getDefaultModelObject(); - Integer minutes = (Integer) get("minutes").getDefaultModelObject(); - - updateDateTime(dateFieldInput, hours, minutes, target); - } - - private void updateDateTime(Object datetime, Integer hours, Integer minutes, AjaxRequestTarget target) { - MutableDateTime date = new MutableDateTime(datetime); - try { - TimeZone zone = getClientTimeZone(); - if (zone != null) { - date.setZone(DateTimeZone.forTimeZone(zone)); - } - - if (hours != null) { - date.set(DateTimeFieldType.hourOfDay(), hours.intValue() % 24); - date.setMinuteOfHour((minutes != null) ? minutes.intValue() : 0); - } - - // the date will be in the server's timezone - setModelObject(date.toDate()); - - if (target != null) { - target.addComponent(this); - } - } catch (RuntimeException e) { - error(e.getMessage()); - invalid(); - } - } - - @Override - protected boolean use12HourFormat() { - return false; - } - - class ChangeBehaviour extends AjaxFormComponentUpdatingBehavior { - private static final long serialVersionUID = 1L; - - ChangeBehaviour() { - super("onChange"); - } - - @Override - protected void onUpdate(AjaxRequestTarget target) { - AjaxDateTimeField.this.onUpdate(target); - } - } -} Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.properties =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.properties 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.properties 2010-03-19 16:10:57 UTC (rev 22195) @@ -1 +0,0 @@ -set-to-current-date=Set the current date and time \ No newline at end of file Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField_nl.properties =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField_nl.properties 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField_nl.properties 2010-03-19 16:10:57 UTC (rev 22195) @@ -1 +0,0 @@ -set-to-current-date=Stel huidige datum en tijdstip in \ No newline at end of file Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.html =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.html 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.html 2010-03-19 16:10:57 UTC (rev 22195) @@ -15,6 +15,6 @@ --> - +
    \ No newline at end of file Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateFieldWidget.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -15,12 +15,19 @@ */ package org.hippoecm.frontend.plugins.yui.datetime; +import java.text.SimpleDateFormat; import java.util.Date; +import org.apache.wicket.markup.html.form.AbstractTextComponent; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; +import org.apache.wicket.util.convert.IConverter; +import org.apache.wicket.util.convert.converters.DateConverter; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.util.MappingException; +import org.hippoecm.frontend.util.PluginConfigMapper; +import org.joda.time.DateTime; public class DateFieldWidget extends Panel { @SuppressWarnings("unused") @@ -29,13 +36,43 @@ private static final long serialVersionUID = 1L; public DateFieldWidget(String id, IModel model, IPluginContext context, IPluginConfig config) { - this(id, model, config.getBoolean("show.today.button"), context, config); + this(id, model, config.getAsBoolean("show.today.button", true), context, config); } public DateFieldWidget(String id, IModel model, boolean todayLinkVisible, IPluginContext context, IPluginConfig config) { super(id, model); - add(new AjaxDateTimeField("widget", model, todayLinkVisible, context, config)); + YuiDatePickerSettings settings = new YuiDatePickerSettings(); + settings.setDatePattern(getDatePattern()); + if(config.containsKey("datepicker")) { + try { + PluginConfigMapper.populate(settings, config.getPluginConfig("datepicker")); + } catch (MappingException e) { + throw new RuntimeException(e); + } + } + YuiDateTimeField dateTimeField = new YuiDateTimeField("widget", model, settings); + dateTimeField.setTodayLinkVisible(todayLinkVisible); + add(dateTimeField); } + private String getDatePattern() { + String format = null; + if (this instanceof AbstractTextComponent.ITextFormatProvider) { + format = ((AbstractTextComponent.ITextFormatProvider) this).getTextFormat(); + // it is possible that components implement ITextFormatProvider but + // don't provide a format + } + + if (format == null) { + IConverter converter = getConverter(DateTime.class); + if (!(converter instanceof DateConverter)) { + converter = getConverter(Date.class); + } + format = ((SimpleDateFormat) ((DateConverter) converter).getDateFormat(getLocale())).toPattern(); + } + return format; + } + + } Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/DateTimeField.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -1,88 +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.yui.datetime; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.apache.wicket.behavior.IBehavior; -import org.apache.wicket.datetime.markup.html.form.DateTextField; -import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider; -import org.apache.wicket.model.IModel; -import org.apache.wicket.util.convert.IConverter; -import org.apache.wicket.util.convert.converters.DateConverter; -import org.hippoecm.frontend.plugin.IPluginContext; -import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.util.MappingException; -import org.hippoecm.frontend.util.PluginConfigMapper; -import org.joda.time.DateTime; - -/** - * Semi-fork of YUI DateTimeField from Wicket extensions. Replaces Wicket extensions YUI behaviors with a {@link YuiDatePicker} - * so it fit's in the Hippo ECM YUI framework. - * - * DatePicker can be configured using a frontend:pluginconfig node with name datepicker. - * - * @see YuiDatePickerSettings - */ -public class DateTimeField extends org.apache.wicket.extensions.yui.calendar.DateTimeField { - private static final long serialVersionUID = 1L; - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - public DateTimeField(String id, IModel model, IPluginContext context, IPluginConfig config) { - super(id, model); - - DateTextField dateField = (DateTextField) get("date"); - //remove Wicket extensions YUI picker and add own - for(IBehavior b : dateField.getBehaviors()) { - dateField.remove(b); - } - - YuiDatePickerSettings settings = new YuiDatePickerSettings(); - settings.setDatePattern(getDatePattern()); - - if(config.containsKey("datepicker")) { - try { - PluginConfigMapper.populate(settings, config.getPluginConfig("datepicker")); - } catch (MappingException e) { - throw new RuntimeException(e); - } - } - dateField.add(new YuiDatePicker(settings)); - } - - private String getDatePattern() { - String format = null; - if (this instanceof ITextFormatProvider) { - format = ((ITextFormatProvider) this).getTextFormat(); - // it is possible that components implement ITextFormatProvider but - // don't provide a format - } - - if (format == null) { - IConverter converter = getConverter(DateTime.class); - if (!(converter instanceof DateConverter)) { - converter = getConverter(Date.class); - } - format = ((SimpleDateFormat) ((DateConverter) converter).getDateFormat(getLocale())).toPattern(); - } - return format; - } - -} Modified: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDatePicker.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -16,17 +16,7 @@ package org.hippoecm.frontend.plugins.yui.datetime; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; -import java.util.Map; - -import org.apache.wicket.Component; -import org.apache.wicket.RequestCycle; -import org.apache.wicket.ResourceReference; -import org.apache.wicket.Response; -import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.extensions.yui.calendar.DatePicker; +import org.apache.wicket.*; import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider; import org.apache.wicket.markup.html.resources.CompressedResourceReference; import org.apache.wicket.model.AbstractReadOnlyModel; @@ -40,22 +30,27 @@ import org.hippoecm.frontend.plugins.yui.header.templates.DynamicTextTemplate; import org.joda.time.DateTime; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; +import java.util.Map; + public class YuiDatePicker extends AbstractYuiBehavior { private static final long serialVersionUID = 1L; - + @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; - - private final PackagedTextTemplate INIT = new PackagedTextTemplate(YuiDatePicker.class, "init.js"); - private static final ResourceReference SKIN = new CompressedResourceReference(YuiDatePicker.class, "skin.css"); - + + private static final ResourceReference SKIN = new CompressedResourceReference(YuiDatePicker.class, "resources/skin.css"); + private Component component; private DynamicTextTemplate template; - + public YuiDatePicker(YuiDatePickerSettings settings) { - this.template = new DynamicTextTemplate(INIT, settings) { + PackagedTextTemplate init = new PackagedTextTemplate(YuiDatePicker.class, "resources/init.js"); + this.template = new DynamicTextTemplate(init, settings) { private static final long serialVersionUID = 1L; - + @Override protected Map getVariables() { Map vars = super.getVariables(); @@ -64,21 +59,21 @@ } }; } - + @Override public void addHeaderContribution(IYuiContext helper) { helper.addCssReference(SKIN); helper.addModule(HippoNamespace.NS, "datetime"); helper.addOnDomLoad(new AbstractReadOnlyModel() { private static final long serialVersionUID = 1L; - + @Override public String getObject() { return "YAHOO.hippo.DateTime.render('" + component.getMarkupId() + "', " + template.getConfigurationAsJSON() + ");"; } }); } - + @Override public void onRendered(Component component) { @@ -87,7 +82,7 @@ // component. Not as pretty as working with a panel etc, but works // for behaviors and is more efficient Response response = component.getResponse(); - response.write("\n  "); } - response.write(""); + response.write("
    "); } - + /** * Indicates whether the calendar should be rendered after it has been loaded. - * + * * @return true if the calendar should be rendered after it has been loaded.
    * false (default) if it's initially hidden. */ @@ -124,11 +119,11 @@ { return false; } - + /** * Gets the escaped DOM id that the calendar widget will get attached to. All non word * characters (\W) will be removed from the string. - * + * * @return The DOM id of the calendar widget - same as the component's markup id + 'Dp'} */ protected final String getEscapedComponentMarkupId() @@ -138,7 +133,7 @@ /** * Gets the id of the icon that triggers the popup. - * + * * @return The id of the icon */ protected final String getIconId() @@ -148,7 +143,7 @@ /** * Gets the style of the icon that triggers the popup. - * + * * @return The style of the icon, e.g. 'cursor: point' etc. */ protected String getIconStyle() @@ -158,25 +153,25 @@ /** * Gets the url for the popup button. Users can override to provide their own icon URL. - * + * * @return the url to use for the popup button/ icon */ protected CharSequence getIconUrl() { //TODO: FIX! - return RequestCycle.get().urlFor(new ResourceReference(DatePicker.class, "icon1.gif")); + return RequestCycle.get().urlFor(new ResourceReference(YuiDatePicker.class, "resources/calendar-16.png")); } /** * Gets the locale that should be used to configure this widget. - * + * * @return By default the locale of the bound component. */ protected Locale getLocale() { return component.getLocale(); } - + @Override public void bind(Component component) { super.bind(component); @@ -184,12 +179,12 @@ checkComponentProvidesDateFormat(component); component.setOutputMarkupId(true); } - + /** * Check that this behavior can get a date format out of the component it is coupled to. It * checks whether {@link #getDatePattern()} produces a non-null value. If that method returns * null, and exception will be thrown - * + * * @param component * the component this behavior is being coupled to * @throws UnableToDetermineFormatException @@ -205,7 +200,7 @@ /** * Gets the date pattern to use for putting selected values in the coupled component. - * + * * @return The date pattern */ protected String getDatePattern() @@ -251,6 +246,6 @@ } } - + } Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html (from rev 22148, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.html) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html 2010-03-19 16:10:57 UTC (rev 22195) @@ -0,0 +1,29 @@ + + + +
    + + + : + + + + + + +
    +     Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.html ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java (from rev 22148, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.java) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java 2010-03-19 16:10:57 UTC (rev 22195) @@ -0,0 +1,147 @@ +/* + * 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.yui.datetime; + +import org.apache.wicket.ResourceReference; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; +import org.apache.wicket.ajax.markup.html.AjaxLink; +import org.apache.wicket.behavior.IBehavior; +import org.apache.wicket.datetime.StyleDateConverter; +import org.apache.wicket.datetime.markup.html.form.DateTextField; +import org.apache.wicket.extensions.yui.calendar.DateTimeField; +import org.apache.wicket.markup.html.image.Image; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.PropertyModel; +import org.joda.time.DateTimeFieldType; +import org.joda.time.DateTimeZone; +import org.joda.time.MutableDateTime; + +import java.util.Date; +import java.util.TimeZone; + +/** + * Semi-fork of YUI DateTimeField from Wicket extensions. Replaces Wicket extensions YUI behaviors with a {@link YuiDatePicker} + * so it fit's in the Hippo ECM YUI framework. + * + * DatePicker can be configured using a frontend:pluginconfig node with name datepicker. + * + * @see YuiDatePickerSettings + */ + +public class YuiDateTimeField extends DateTimeField { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id: AjaxDateTimeField.java 19048 2009-07-28 16:08:33Z abogaart $"; + + private static final long serialVersionUID = 1L; + + private boolean todayLinkVisible = true; + + public YuiDateTimeField(String id, IModel model) { + this(id, model, new YuiDatePickerSettings()); + } + + public YuiDateTimeField(String id, IModel model, YuiDatePickerSettings settings) { + super(id, model); + + setOutputMarkupId(true); + + //replace Wicket extensions YUI picker with our own + DateTextField dateField = (DateTextField) get("date"); + for(IBehavior b : dateField.getBehaviors()) { + dateField.remove(b); + } + dateField.add(new YuiDatePicker(settings)); + + //add "Now" link + AjaxLink today; + add(today = new AjaxLink("today") { + private static final long serialVersionUID = 1L; + + @Override + public void onClick(AjaxRequestTarget target) { + setDate(new Date()); + if (target != null) { + target.addComponent(this); + } + } + + @Override + public boolean isVisible() { + return todayLinkVisible; + } + }); + + today.add(new Image("current-date-img", new ResourceReference(YuiDateTimeField.class, "resources/set-now-16.png"))); + + //Add change behavior to super fields + for(String name : new String[] {"date", "hours", "minutes", "amOrPmChoice"}) { + get(name).add(new AjaxFormComponentUpdatingBehavior("onChange") { + + @Override + protected void onUpdate(AjaxRequestTarget target) { + YuiDateTimeField.this.onUpdate(target); + } + }); + } + } + + // callback that the ChangeBehaviour calls when one of the composing fields updates + public void onUpdate(AjaxRequestTarget target) { + updateDateTime(getDate(), getHours(), getMinutes()); + + if (target != null) { + target.addComponent(this); + } + } + + private void updateDateTime(Date date, Integer hours, Integer minutes) { + MutableDateTime datetime = new MutableDateTime(date); + try { + TimeZone zone = getClientTimeZone(); + if (zone != null) { + datetime.setZone(DateTimeZone.forTimeZone(zone)); + } + + if (hours != null) { + datetime.set(DateTimeFieldType.hourOfDay(), hours % 24); + datetime.setMinuteOfHour(minutes != null ? minutes : 0); + } + + // the date will be in the server's timezone + setDate(datetime.toDate()); + //setModelObject(datetime.toDate()); + } catch (RuntimeException e) { + error(e.getMessage()); + invalid(); + } + } + + @Override + protected boolean use12HourFormat() { + return false; + } + + public void setTodayLinkVisible(boolean todayLinkVisible) { + this.todayLinkVisible = todayLinkVisible; + } + + @Override + protected DateTextField newDateTextField(String id, PropertyModel dateFieldModel) { + return new DateTextField(id, dateFieldModel, new StyleDateConverter(false)); + } + +} Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties (from rev 22159, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField.properties) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties 2010-03-19 16:10:57 UTC (rev 22195) @@ -0,0 +1,2 @@ +set-to-current-date=Set current date and time +set-to-current-date-tooltip=Click to set current date and time \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties (from rev 22159, hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/AjaxDateTimeField_nl.properties) =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties 2010-03-19 16:10:57 UTC (rev 22195) @@ -0,0 +1,2 @@ +set-to-current-date=Huidige datum en tijdstip +set-to-current-date-tooltip=Klik om de huidige datum en tijdstip in te stellen \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/init.js =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/init.js 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/init.js 2010-03-19 16:10:57 UTC (rev 22195) @@ -1 +0,0 @@ -YAHOO.hippo.DateTime.register("${id}", ${config}); Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/skin.css =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/skin.css 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/skin.css 2010-03-19 16:10:57 UTC (rev 22195) @@ -1,342 +0,0 @@ -/* YUI skinning isn't working as should so I've copied the calendar sam skin into a hippo-editor-field-datepicker namespace */ - -/* CALENDAR BOUNDING BOX */ -.hippo-root .yui-calcontainer { - background-color:#f2f2f2; - border:1px solid #808080; - padding:10px; - z-index: 21000; -} - -/* CALENDARGROUP BOUNDING BOX */ -.hippo-root .yui-calcontainer.multi { - padding:0 5px 0 5px; -} - -/* BOUNDING BOX FOR EACH CALENDAR GROUP PAGE */ -.hippo-root .yui-calcontainer.multi .groupcal { - background-color:transparent; - border:none; - padding:10px 5px 10px 5px; - margin:0; -} - -/* TITLE BAR */ -.hippo-root .yui-calcontainer .title { - background:url(sprite.png) repeat-x 0 0; - border-bottom:1px solid #cccccc; - font:100% sans-serif; - color:#000; - font-weight:bold; - height:auto; - padding:.4em; - margin:0 -10px 10px -10px; - top:0; - left:0; - text-align:left; -} - -.hippo-root .yui-calcontainer.multi .title { - margin:0 -5px 0 -5px; -} - -.hippo-root .yui-calcontainer.withtitle { - padding-top:0; -} - -/* CLOSE BUTTON */ -.hippo-root .yui-calcontainer .calclose { - background:url(sprite.png) no-repeat 0 -300px; - width:25px; - height:15px; - top:.4em; - right:.4em; - cursor:pointer; -} - -/* CALENDAR TABLE */ -.hippo-root .yui-calendar { - border-spacing:0; - border-collapse:collapse; - font:100% sans-serif; - text-align:center; - margin:0; -} - -/* NAVBAR BOUNDING BOX */ -.hippo-root .yui-calendar .calhead { - background:transparent; - border:none; - vertical-align:middle; - padding:0; -} - -/* NAVBAR TEXT CONTAINER */ -.hippo-root .yui-calendar .calheader { - background:transparent; - font-weight:bold; - padding:0 0 .6em 0; - text-align:center; -} - -.hippo-root .yui-calendar .calheader img { - border:none; -} - -/* NAVBAR LEFT ARROW */ -.hippo-root .yui-calendar .calnavleft { - background:url(sprite.png) no-repeat 0 -450px; - width:25px; - height:15px; - top:0; - bottom:0; - left:-10px; - margin-left:.4em; - cursor:pointer; -} - -/* NAVBAR RIGHT ARROW */ -.hippo-root .yui-calendar .calnavright { - background:url(sprite.png) no-repeat 0 -500px; - width:25px; - height:15px; - top:0; - bottom:0; - right:-10px; - margin-right:.4em; - cursor:pointer; -} - -/* WEEKDAY HEADER ROW */ -.hippo-root .yui-calendar .calweekdayrow { - height:2em; -} - -.hippo-root .yui-calendar .calweekdayrow th { - padding:0; - border:none; -} - -/* WEEKDAY (Su, Mo, Tu...) HEADER CELLS */ -.hippo-root .yui-calendar .calweekdaycell { - color:#000; - font-weight:bold; - text-align:center; - width:2em; -} - -/* CALENDAR FOOTER. NOT IMPLEMENTED BY DEFAULT */ -.hippo-root .yui-calendar .calfoot { - background-color:#f2f2f2; -} - -/* WEEK NUMBERS (ROW HEADERS/FOOTERS) */ -.hippo-root .yui-calendar .calrowhead, .hippo-root .yui-calendar .calrowfoot { - color:#a6a6a6; - font-size:85%; - font-style:normal; - font-weight:normal; - border:none; -} - -.hippo-root .yui-calendar .calrowhead { - text-align:right; - padding:0 2px 0 0; -} - -.hippo-root .yui-calendar .calrowfoot { - text-align:left; - padding:0 0 0 2px; -} - -/* NORMAL CELLS */ -.hippo-root .yui-calendar td.calcell { - border:1px solid #cccccc; - background:#fff; - padding:1px; - height:1.6em; - line-height:1.6em; /* set line height equal to cell height to center vertically */ - text-align:center; - white-space:nowrap; -} - -/* LINK INSIDE NORMAL CELLS */ -.hippo-root .yui-calendar td.calcell a { - color:#0066cc; - display:block; - height:100%; - text-decoration:none; -} - -/* TODAY'S DATE */ -.hippo-root .yui-calendar td.calcell.today { - background-color:#000; -} - -.hippo-root .yui-calendar td.calcell.today a { - background-color:#fff; -} - -/* OOM DATES */ -.hippo-root .yui-calendar td.calcell.oom { - background-color:#cccccc; - color:#a6a6a6; - cursor:default; -} - -/* SELECTED DATE */ -.hippo-root .yui-calendar td.calcell.selected { - background-color:#fff; - color:#000; -} - -.hippo-root .yui-calendar td.calcell.selected a { - background-color:#b3d4ff; - color:#000; -} - -/* HOVER DATE */ -.hippo-root .yui-calendar td.calcell.calcellhover { - background-color:#426fd9; - color:#fff; - cursor:pointer; -} - -.hippo-root .yui-calendar td.calcell.calcellhover a { - background-color:#426fd9; - color:#fff; -} - -/* DEFAULT OOB DATES */ -.hippo-root .yui-calendar td.calcell.previous { - color:#e0e0e0; -} - -/* CUSTOM RENDERERS */ -.hippo-root .yui-calendar td.calcell.restricted { text-decoration:line-through; } -.hippo-root .yui-calendar td.calcell.highlight1 { background-color:#ccff99; } -.hippo-root .yui-calendar td.calcell.highlight2 { background-color:#99ccff; } -.hippo-root .yui-calendar td.calcell.highlight3 { background-color:#ffcccc; } -.hippo-root .yui-calendar td.calcell.highlight4 { background-color:#ccff99; } - -/* CalendarNavigator */ - -/* MONTH/YEAR LABEL */ -.hippo-root .yui-calendar a.calnav { - border: 1px solid #f2f2f2; - padding:0 4px; - text-decoration:none; - color:#000; - zoom:1; -} - -.hippo-root .yui-calendar a.calnav:hover { - background: url(sprite.png) repeat-x 0 0; - border-color:#A0A0A0; - cursor:pointer; -} - -/* NAVIGATOR MASK */ -.hippo-root .yui-calcontainer .yui-cal-nav-mask { - background-color:#000; - opacity:0.25; - filter:alpha(opacity=25); /* IE */ -} - -/* NAVIGATOR BOUNDING BOX */ -.hippo-root .yui-calcontainer .yui-cal-nav { - font-family:arial,helvetica,clean,sans-serif; - font-size:93%; - border:1px solid #808080; - left:50%; - margin-left:-7em; - width:14em; - padding:0; - top:2.5em; - background-color:#f2f2f2; -} - -.hippo-root .yui-calcontainer.withtitle .yui-cal-nav { - top:4.5em; -} - -/* NAVIGATOR BOUNDING BOX */ -.hippo-root .yui-calcontainer.multi .yui-cal-nav { - width:16em; - margin-left:-8em; -} - -/* NAVIGATOR YEAR/MONTH/BUTTON/ERROR BOUNDING BLOCKS */ -.hippo-root .yui-calcontainer .yui-cal-nav-y, -.hippo-root .yui-calcontainer .yui-cal-nav-m, -.hippo-root .yui-calcontainer .yui-cal-nav-b { - padding:5px 10px 5px 10px; -} - -.hippo-root .yui-calcontainer .yui-cal-nav-b { - text-align:center; -} - -.hippo-root .yui-calcontainer .yui-cal-nav-e { - margin-top:5px; - padding:5px; - background-color:#EDF5FF; - border-top:1px solid black; - display:none; -} - -/* NAVIGATOR LABELS */ -.hippo-root .yui-calcontainer .yui-cal-nav label { - display:block; - font-weight:bold; -} - -/* NAVIGATOR MONTH CONTROL */ -.hippo-root .yui-calcontainer .yui-cal-nav-mc { - width:100%; - _width:auto; /* IE6, IE7 Quirks don't handle 100% well */ -} - -/* NAVIGATOR MONTH CONTROL, VALIDATION ERROR */ -.hippo-root .yui-calcontainer .yui-cal-nav-y input.yui-invalid { - background-color:#FFEE69; - border: 1px solid #000; -} - -/* NAVIGATOR YEAR CONTROL */ -.hippo-root .yui-calcontainer .yui-cal-nav-yc { - width:4em; -} - -/* NAVIGATOR BUTTONS */ - -/* BUTTON WRAPPER */ -.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn { - border:1px solid #808080; - background: url(sprite.png) repeat-x 0 0; - background-color:#ccc; - margin: auto .15em; -} - -/* BUTTON (based on button-skin.css) */ -.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn button { - padding:0 8px; - font-size:93%; - line-height: 2; /* ~24px */ - *line-height: 1.7; /* For IE */ - min-height: 2em; /* For Gecko */ - *min-height: auto; /* For IE */ - color: #000; -} - -/* DEFAULT BUTTONS */ -/* NOTE: IE6 will only pickup the yui-default specifier from the multiple class specifier */ -.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default { - border:1px solid #304369; - background-color: #426fd9; - background: url(sprite.png) repeat-x 0 -1400px; -} - -.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default button { - color:#fff; -} Deleted: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/sprite.png =================================================================== (Binary files differ) Modified: hippo-ecm/trunk/package/skin/src/main/webapp/screen.css =================================================================== --- hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2010-03-19 15:11:05 UTC (rev 22194) +++ hippo-ecm/trunk/package/skin/src/main/webapp/screen.css 2010-03-19 16:10:57 UTC (rev 22195) @@ -801,19 +801,26 @@ .hippo-editor .hippo-editor-threepane .hippo-gallery-field-picker tr td{vertical-align: middle} /* date widget */ -.hippo-editor-field .hippo-editor-field-datepicker input{width: 80px} -.hippo-editor-field .hippo-editor-field-datepicker input.time { border: 1px solid #e3e3e3; width: 30px; padding: 2px;} -.hippo-editor-field .hippo-editor-field-datepicker span.yui-skin-sam { margin-right: 15px; } -.hippo-editor-field .hippo-editor-field-datepicker input.today { border: 1px solid #e3e3e3; width: auto; padding: 2px; margin: 0px; } +.hippo-editor-field .yui-date-time-field {padding-left: 4px;} +.hippo-editor-field-datepicker -.hippo-editor-field .hippo-editor-field-datepicker select{width: 70px} +.yui-date-time-field {height: 24px;} +.yui-date-time-field input { border: 1px solid #e3e3e3; padding: 2px; height: 14px; float:left;} +.yui-date-time-field input.date { width: 55px;} +.yui-date-time-field input.time { width: 17px; } +.yui-date-time-field span.time-separator {float: left; margin-top: 4px; } +.yui-date-time-field div.yui-skin-sam { height: 20px; margin-right: 20px; float: left; padding-top: 4px; } +.yui-date-time-field input.today { border: 1px solid #e3e3e3; width: auto; padding: 2px; margin: 0px; } +.yui-date-time-field a.today-link { margin-left: 20px; display: block; float: left; color: #107EC0; height: 21px; padding-top: 1px;} +.yui-date-time-field a.today-link img { position: relative; top: 4px; } +.yui-date-time-field select{width: 70px} /* Xinha xml editor used in the hippo-editor-field-html plugin */ .hippo-editor-field-html{background: url("images/hippo-border.gif") repeat-x 0px 30px; padding: 0px;} .hippo-editor-field-html .htmlarea {background: transparent; border: 0px solid white; border-collapse: separate} .hippo-editor-field-html .htmlarea *{padding: 0px; margin: 0px; border: none;} -/* hide the xinha status bar we don't need it */ +/* hide the xinha status bar we don't need it */x .hippo-editor-field-html .htmlarea .statusBar{display: none} .hippo-editor-field-html .htmlarea tr td{vertical-align: top;} .hippo-editor-field-html .htmlarea tr td select{margin-top: 2px; font-size: 11px;} From svn-logs at hippocms.org Fri Mar 19 17:12:37 2010 From: svn-logs at hippocms.org (abogaart) Date: Fri Mar 19 17:17:31 2010 Subject: [HippoRepos-dev] [22196] hippo-ecm: HREPTWO-3982 - Restyle date picker Message-ID: <20100319161237.2F3CF1C020@svn.vm.castaserver.com> Revision: 22196 Author: abogaart Date: 2010-03-19 17:12:36 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3982 - Restyle date picker - moved resources and add new icons Added Paths: ----------- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/calendar-16.png hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/init.js hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/set-now-16.png hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/skin.css hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/sprite.png Added: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/calendar-16.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/calendar-16.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/init.js =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/init.js (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/init.js 2010-03-19 16:12:36 UTC (rev 22196) @@ -0,0 +1 @@ +YAHOO.hippo.DateTime.register("${id}", ${config}); Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/init.js ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/set-now-16.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/set-now-16.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/skin.css =================================================================== --- hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/skin.css (rev 0) +++ hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/skin.css 2010-03-19 16:12:36 UTC (rev 22196) @@ -0,0 +1,342 @@ +/* YUI skinning isn't working as should so I've copied the calendar sam skin into a hippo-editor-field-datepicker namespace */ + +/* CALENDAR BOUNDING BOX */ +.hippo-root .yui-calcontainer { + background-color:#f2f2f2; + border:1px solid #808080; + padding:10px; + z-index: 21000; +} + +/* CALENDARGROUP BOUNDING BOX */ +.hippo-root .yui-calcontainer.multi { + padding:0 5px 0 5px; +} + +/* BOUNDING BOX FOR EACH CALENDAR GROUP PAGE */ +.hippo-root .yui-calcontainer.multi .groupcal { + background-color:transparent; + border:none; + padding:10px 5px 10px 5px; + margin:0; +} + +/* TITLE BAR */ +.hippo-root .yui-calcontainer .title { + background:url(sprite.png) repeat-x 0 0; + border-bottom:1px solid #cccccc; + font:100% sans-serif; + color:#000; + font-weight:bold; + height:auto; + padding:.4em; + margin:0 -10px 10px -10px; + top:0; + left:0; + text-align:left; +} + +.hippo-root .yui-calcontainer.multi .title { + margin:0 -5px 0 -5px; +} + +.hippo-root .yui-calcontainer.withtitle { + padding-top:0; +} + +/* CLOSE BUTTON */ +.hippo-root .yui-calcontainer .calclose { + background:url(sprite.png) no-repeat 0 -300px; + width:25px; + height:15px; + top:.4em; + right:.4em; + cursor:pointer; +} + +/* CALENDAR TABLE */ +.hippo-root .yui-calendar { + border-spacing:0; + border-collapse:collapse; + font:100% sans-serif; + text-align:center; + margin:0; +} + +/* NAVBAR BOUNDING BOX */ +.hippo-root .yui-calendar .calhead { + background:transparent; + border:none; + vertical-align:middle; + padding:0; +} + +/* NAVBAR TEXT CONTAINER */ +.hippo-root .yui-calendar .calheader { + background:transparent; + font-weight:bold; + padding:0 0 .6em 0; + text-align:center; +} + +.hippo-root .yui-calendar .calheader img { + border:none; +} + +/* NAVBAR LEFT ARROW */ +.hippo-root .yui-calendar .calnavleft { + background:url(sprite.png) no-repeat 0 -450px; + width:25px; + height:15px; + top:0; + bottom:0; + left:-10px; + margin-left:.4em; + cursor:pointer; +} + +/* NAVBAR RIGHT ARROW */ +.hippo-root .yui-calendar .calnavright { + background:url(sprite.png) no-repeat 0 -500px; + width:25px; + height:15px; + top:0; + bottom:0; + right:-10px; + margin-right:.4em; + cursor:pointer; +} + +/* WEEKDAY HEADER ROW */ +.hippo-root .yui-calendar .calweekdayrow { + height:2em; +} + +.hippo-root .yui-calendar .calweekdayrow th { + padding:0; + border:none; +} + +/* WEEKDAY (Su, Mo, Tu...) HEADER CELLS */ +.hippo-root .yui-calendar .calweekdaycell { + color:#000; + font-weight:bold; + text-align:center; + width:2em; +} + +/* CALENDAR FOOTER. NOT IMPLEMENTED BY DEFAULT */ +.hippo-root .yui-calendar .calfoot { + background-color:#f2f2f2; +} + +/* WEEK NUMBERS (ROW HEADERS/FOOTERS) */ +.hippo-root .yui-calendar .calrowhead, .hippo-root .yui-calendar .calrowfoot { + color:#a6a6a6; + font-size:85%; + font-style:normal; + font-weight:normal; + border:none; +} + +.hippo-root .yui-calendar .calrowhead { + text-align:right; + padding:0 2px 0 0; +} + +.hippo-root .yui-calendar .calrowfoot { + text-align:left; + padding:0 0 0 2px; +} + +/* NORMAL CELLS */ +.hippo-root .yui-calendar td.calcell { + border:1px solid #cccccc; + background:#fff; + padding:1px; + height:1.6em; + line-height:1.6em; /* set line height equal to cell height to center vertically */ + text-align:center; + white-space:nowrap; +} + +/* LINK INSIDE NORMAL CELLS */ +.hippo-root .yui-calendar td.calcell a { + color:#0066cc; + display:block; + height:100%; + text-decoration:none; +} + +/* TODAY'S DATE */ +.hippo-root .yui-calendar td.calcell.today { + background-color:#000; +} + +.hippo-root .yui-calendar td.calcell.today a { + background-color:#fff; +} + +/* OOM DATES */ +.hippo-root .yui-calendar td.calcell.oom { + background-color:#cccccc; + color:#a6a6a6; + cursor:default; +} + +/* SELECTED DATE */ +.hippo-root .yui-calendar td.calcell.selected { + background-color:#fff; + color:#000; +} + +.hippo-root .yui-calendar td.calcell.selected a { + background-color:#b3d4ff; + color:#000; +} + +/* HOVER DATE */ +.hippo-root .yui-calendar td.calcell.calcellhover { + background-color:#426fd9; + color:#fff; + cursor:pointer; +} + +.hippo-root .yui-calendar td.calcell.calcellhover a { + background-color:#426fd9; + color:#fff; +} + +/* DEFAULT OOB DATES */ +.hippo-root .yui-calendar td.calcell.previous { + color:#e0e0e0; +} + +/* CUSTOM RENDERERS */ +.hippo-root .yui-calendar td.calcell.restricted { text-decoration:line-through; } +.hippo-root .yui-calendar td.calcell.highlight1 { background-color:#ccff99; } +.hippo-root .yui-calendar td.calcell.highlight2 { background-color:#99ccff; } +.hippo-root .yui-calendar td.calcell.highlight3 { background-color:#ffcccc; } +.hippo-root .yui-calendar td.calcell.highlight4 { background-color:#ccff99; } + +/* CalendarNavigator */ + +/* MONTH/YEAR LABEL */ +.hippo-root .yui-calendar a.calnav { + border: 1px solid #f2f2f2; + padding:0 4px; + text-decoration:none; + color:#000; + zoom:1; +} + +.hippo-root .yui-calendar a.calnav:hover { + background: url(sprite.png) repeat-x 0 0; + border-color:#A0A0A0; + cursor:pointer; +} + +/* NAVIGATOR MASK */ +.hippo-root .yui-calcontainer .yui-cal-nav-mask { + background-color:#000; + opacity:0.25; + filter:alpha(opacity=25); /* IE */ +} + +/* NAVIGATOR BOUNDING BOX */ +.hippo-root .yui-calcontainer .yui-cal-nav { + font-family:arial,helvetica,clean,sans-serif; + font-size:93%; + border:1px solid #808080; + left:50%; + margin-left:-7em; + width:14em; + padding:0; + top:2.5em; + background-color:#f2f2f2; +} + +.hippo-root .yui-calcontainer.withtitle .yui-cal-nav { + top:4.5em; +} + +/* NAVIGATOR BOUNDING BOX */ +.hippo-root .yui-calcontainer.multi .yui-cal-nav { + width:16em; + margin-left:-8em; +} + +/* NAVIGATOR YEAR/MONTH/BUTTON/ERROR BOUNDING BLOCKS */ +.hippo-root .yui-calcontainer .yui-cal-nav-y, +.hippo-root .yui-calcontainer .yui-cal-nav-m, +.hippo-root .yui-calcontainer .yui-cal-nav-b { + padding:5px 10px 5px 10px; +} + +.hippo-root .yui-calcontainer .yui-cal-nav-b { + text-align:center; +} + +.hippo-root .yui-calcontainer .yui-cal-nav-e { + margin-top:5px; + padding:5px; + background-color:#EDF5FF; + border-top:1px solid black; + display:none; +} + +/* NAVIGATOR LABELS */ +.hippo-root .yui-calcontainer .yui-cal-nav label { + display:block; + font-weight:bold; +} + +/* NAVIGATOR MONTH CONTROL */ +.hippo-root .yui-calcontainer .yui-cal-nav-mc { + width:100%; + _width:auto; /* IE6, IE7 Quirks don't handle 100% well */ +} + +/* NAVIGATOR MONTH CONTROL, VALIDATION ERROR */ +.hippo-root .yui-calcontainer .yui-cal-nav-y input.yui-invalid { + background-color:#FFEE69; + border: 1px solid #000; +} + +/* NAVIGATOR YEAR CONTROL */ +.hippo-root .yui-calcontainer .yui-cal-nav-yc { + width:4em; +} + +/* NAVIGATOR BUTTONS */ + +/* BUTTON WRAPPER */ +.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn { + border:1px solid #808080; + background: url(sprite.png) repeat-x 0 0; + background-color:#ccc; + margin: auto .15em; +} + +/* BUTTON (based on button-skin.css) */ +.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn button { + padding:0 8px; + font-size:93%; + line-height: 2; /* ~24px */ + *line-height: 1.7; /* For IE */ + min-height: 2em; /* For Gecko */ + *min-height: auto; /* For IE */ + color: #000; +} + +/* DEFAULT BUTTONS */ +/* NOTE: IE6 will only pickup the yui-default specifier from the multiple class specifier */ +.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default { + border:1px solid #304369; + background-color: #426fd9; + background: url(sprite.png) repeat-x 0 -1400px; +} + +.hippo-root .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default button { + color:#fff; +} Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/skin.css ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/sprite.png =================================================================== (Binary files differ) Property changes on: hippo-ecm/trunk/addon/yui/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/resources/sprite.png ___________________________________________________________________ Added: svn:mime-type + image/png From helpdesk at onehippo.com Fri Mar 19 17:23:48 2010 From: helpdesk at onehippo.com (JIRA (Bart van der Schans)) Date: Fri Mar 19 17:28:40 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3992) Improve DTD loading of the replication.xml and make the dtd public available Message-ID: <28493215.8891.1269015828489.JavaMail.jira@jira.vm.castaserver.com> Improve DTD loading of the replication.xml and make the dtd public available ---------------------------------------------------------------------------- Key: HREPTWO-3992 URL: http://issues.onehippo.com/browse/HREPTWO-3992 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Bart van der Schans Assignee: Bart van der Schans Fix For: r2.12.09, r2.13.00 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 17:23:50 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 17:28:49 2010 Subject: [HippoRepos-dev] [22197] hippo-ecm: HREPTWO-3992: Improve DTD loading of the replication. xml and make the dtd public available Message-ID: <20100319162350.99A681C020@svn.vm.castaserver.com> Revision: 22197 Author: bvdschans Date: 2010-03-19 17:23:50 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3992: Improve DTD loading of the replication.xml and make the dtd public available Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java Added Paths: ----------- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/ hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml Removed Paths: ------------- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml Added: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java (rev 0) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java 2010-03-19 16:23:50 UTC (rev 22197) @@ -0,0 +1,107 @@ +package org.hippoecm.repository.replication.config; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ + +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + +/** + * Entity resolver for Hippo configuration files. + * This simple resolver contains mappings for the following + * public identifiers used for the Jackrabbit configuration files: + *
      + *
    • -//Hippo//DTD Replication 1.0//EN
      • + *
    + *

    + * Also the following system identifiers are mapped to local resources: + *

      + *
    • http://repository.hippocms.org/dtd/repository-1.0.dtd
      • + *
    + *

    + * The public identifiers are mapped to document type definition + * files included in the hippo-ecm-repository-engine jar archive. + */ +class HippoConfigurationEntityResolver implements EntityResolver { + + /** + * The singleton instance of this class. + */ + public static final EntityResolver INSTANCE = + new HippoConfigurationEntityResolver(); + + /** + * Public identifiers. + */ + private final Map publicIds = new HashMap(); + + /** + * System identifiers. + */ + private final Map systemIds = new HashMap(); + + /** + * Creates the singleton instance of this class. + */ + private HippoConfigurationEntityResolver() { + // Hippo Replication 1.0 DTD + publicIds.put( + "-//Hippo//DTD Replication 1.0//EN", + "replication-1.0.dtd"); + systemIds.put( + "http://repository.hippocms.org/dtd/replication-1.0.dtd", + "replication-1.0.dtd"); + } + + /** + * Resolves an entity to the corresponding input source. + * + * @param publicId public identifier + * @param systemId system identifier + * @return resolved entity source + * @throws SAXException on SAX errors + * @throws IOException on IO errors + */ + public InputSource resolveEntity(String publicId, String systemId) + throws SAXException, IOException { + String name; + + name = (String) publicIds.get(publicId); + if (name != null) { + InputStream stream = getClass().getResourceAsStream(name); + if (stream != null) { + return new InputSource(stream); + } + } + + name = (String) systemIds.get(systemId); + if (name != null) { + InputStream stream = getClass().getResourceAsStream(name); + if (stream != null) { + return new InputSource(stream); + } + } + + return null; + } + +} Property changes on: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java 2010-03-19 16:12:36 UTC (rev 22196) +++ hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java 2010-03-19 16:23:50 UTC (rev 22197) @@ -15,19 +15,28 @@ */ package org.hippoecm.repository.replication.config; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.apache.jackrabbit.core.config.ConfigurationErrorHandler; import org.apache.jackrabbit.core.config.ConfigurationException; import org.apache.jackrabbit.core.config.ConfigurationParser; import org.apache.jackrabbit.core.config.JournalConfig; +import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * Configuration parser. This class is used to parse the replication configuration file. @@ -299,4 +308,37 @@ props.putAll(variables); return new ReplicationConfigurationParser(props); } + + + /** + * The method is overridden because the HippoConfigurationEntityResolver + * is needed. + */ + @Override + protected Element parseXML(InputSource xml, boolean validate) throws ConfigurationException { + try { + DocumentBuilderFactory factory = + DocumentBuilderFactory.newInstance(); + factory.setValidating(validate); + DocumentBuilder builder = factory.newDocumentBuilder(); + if (validate) { + builder.setErrorHandler(new ConfigurationErrorHandler()); + } + builder.setEntityResolver(HippoConfigurationEntityResolver.INSTANCE); + Document document = builder.parse(xml); + return document.getDocumentElement(); + } catch (ParserConfigurationException e) { + throw new ConfigurationException( + "Unable to create configuration XML parser", e); + } catch (SAXParseException e) { + throw new ConfigurationException( + "Configuration file syntax error. (Line: " + e.getLineNumber() + " Column: " + e.getColumnNumber() + ")", e); + } catch (SAXException e) { + throw new ConfigurationException( + "Configuration file syntax error. ", e); + } catch (IOException e) { + throw new ConfigurationException( + "Configuration file could not be read.", e); + } + } } Added: hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd (rev 0) +++ hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd 2010-03-19 16:23:50 UTC (rev 22197) @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + Property changes on: hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml (rev 0) +++ hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:23:50 UTC (rev 22197) @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Deleted: hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd 2010-03-19 16:12:36 UTC (rev 22196) +++ hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd 2010-03-19 16:23:50 UTC (rev 22197) @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - Deleted: hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml 2010-03-19 16:12:36 UTC (rev 22196) +++ hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml 2010-03-19 16:23:50 UTC (rev 22197) @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From svn-logs at hippocms.org Fri Mar 19 17:26:20 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 17:31:17 2010 Subject: [HippoRepos-dev] [22198] hippo-ecm: HREPTWO-3992: Improve DTD loading of the replication. xml and make the dtd public available Message-ID: <20100319162620.9C90F1C020@svn.vm.castaserver.com> Revision: 22198 Author: bvdschans Date: 2010-03-19 17:26:20 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3992: Improve DTD loading of the replication.xml and make the dtd public available Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java Added Paths: ----------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml Removed Paths: ------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml Property Changed: ---------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/ Property changes on: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine ___________________________________________________________________ Added: svn:mergeinfo + /hippo-ecm/branches/Branch-HREPTWO-v2_03_xx/repository/engine:17183-17186,17202,17206,17211-17212 /hippo-ecm/branches/Branch-HREPTWO-v2_09_xx/repository/engine:20255-20460,21500,21505,21641,21766,21878,21916 /hippo-ecm/branches/Branch-HREPTWO-v2_10_xx/repository/engine:21204 /hippo-ecm/branches/wicket_upgrade_to_1_4/repository/engine:20604-20690 /hippo-ecm/trunk/repository/engine:21835,21838,21844,21864,21866,21871,21882,21933,21937,21997,22005,22007,22014-22015,22031,22035,22050,22054-22056,22062,22071,22197 Copied: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java (from rev 22197, hippo-ecm/trunk/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java) =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/HippoConfigurationEntityResolver.java 2010-03-19 16:26:20 UTC (rev 22198) @@ -0,0 +1,107 @@ +package org.hippoecm.repository.replication.config; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ + +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + +/** + * Entity resolver for Hippo configuration files. + * This simple resolver contains mappings for the following + * public identifiers used for the Jackrabbit configuration files: + *

      + *
    • -//Hippo//DTD Replication 1.0//EN
      • + *
    + *

    + * Also the following system identifiers are mapped to local resources: + *

      + *
    • http://repository.hippocms.org/dtd/repository-1.0.dtd
      • + *
    + *

    + * The public identifiers are mapped to document type definition + * files included in the hippo-ecm-repository-engine jar archive. + */ +class HippoConfigurationEntityResolver implements EntityResolver { + + /** + * The singleton instance of this class. + */ + public static final EntityResolver INSTANCE = + new HippoConfigurationEntityResolver(); + + /** + * Public identifiers. + */ + private final Map publicIds = new HashMap(); + + /** + * System identifiers. + */ + private final Map systemIds = new HashMap(); + + /** + * Creates the singleton instance of this class. + */ + private HippoConfigurationEntityResolver() { + // Hippo Replication 1.0 DTD + publicIds.put( + "-//Hippo//DTD Replication 1.0//EN", + "replication-1.0.dtd"); + systemIds.put( + "http://repository.hippocms.org/dtd/replication-1.0.dtd", + "replication-1.0.dtd"); + } + + /** + * Resolves an entity to the corresponding input source. + * + * @param publicId public identifier + * @param systemId system identifier + * @return resolved entity source + * @throws SAXException on SAX errors + * @throws IOException on IO errors + */ + public InputSource resolveEntity(String publicId, String systemId) + throws SAXException, IOException { + String name; + + name = (String) publicIds.get(publicId); + if (name != null) { + InputStream stream = getClass().getResourceAsStream(name); + if (stream != null) { + return new InputSource(stream); + } + } + + name = (String) systemIds.get(systemId); + if (name != null) { + InputStream stream = getClass().getResourceAsStream(name); + if (stream != null) { + return new InputSource(stream); + } + } + + return null; + } + +} Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java 2010-03-19 16:23:50 UTC (rev 22197) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/java/org/hippoecm/repository/replication/config/ReplicationConfigurationParser.java 2010-03-19 16:26:20 UTC (rev 22198) @@ -15,19 +15,28 @@ */ package org.hippoecm.repository.replication.config; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.apache.jackrabbit.core.config.ConfigurationErrorHandler; import org.apache.jackrabbit.core.config.ConfigurationException; import org.apache.jackrabbit.core.config.ConfigurationParser; import org.apache.jackrabbit.core.config.JournalConfig; +import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * Configuration parser. This class is used to parse the replication configuration file. @@ -299,4 +308,37 @@ props.putAll(variables); return new ReplicationConfigurationParser(props); } + + + /** + * The method is overridden because the HippoConfigurationEntityResolver + * is needed. + */ + @Override + protected Element parseXML(InputSource xml, boolean validate) throws ConfigurationException { + try { + DocumentBuilderFactory factory = + DocumentBuilderFactory.newInstance(); + factory.setValidating(validate); + DocumentBuilder builder = factory.newDocumentBuilder(); + if (validate) { + builder.setErrorHandler(new ConfigurationErrorHandler()); + } + builder.setEntityResolver(HippoConfigurationEntityResolver.INSTANCE); + Document document = builder.parse(xml); + return document.getDocumentElement(); + } catch (ParserConfigurationException e) { + throw new ConfigurationException( + "Unable to create configuration XML parser", e); + } catch (SAXParseException e) { + throw new ConfigurationException( + "Configuration file syntax error. (Line: " + e.getLineNumber() + " Column: " + e.getColumnNumber() + ")", e); + } catch (SAXException e) { + throw new ConfigurationException( + "Configuration file syntax error. ", e); + } catch (IOException e) { + throw new ConfigurationException( + "Configuration file could not be read.", e); + } + } } Deleted: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd 2010-03-19 16:23:50 UTC (rev 22197) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd 2010-03-19 16:26:20 UTC (rev 22198) @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - Copied: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd (from rev 22197, hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd) =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-1.0.dtd 2010-03-19 16:26:20 UTC (rev 22198) @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + Deleted: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:23:50 UTC (rev 22197) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:26:20 UTC (rev 22198) @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copied: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml (from rev 22197, hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml) =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml (rev 0) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:26:20 UTC (rev 22198) @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Deleted: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd 2010-03-19 16:23:50 UTC (rev 22197) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-1.0.dtd 2010-03-19 16:26:20 UTC (rev 22198) @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - Deleted: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml 2010-03-19 16:23:50 UTC (rev 22197) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/replication-example.xml 2010-03-19 16:26:20 UTC (rev 22198) @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From helpdesk at onehippo.com Fri Mar 19 17:29:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 19 17:34:40 2010 Subject: [HippoRepos-dev] [JIRA] Reopened: (HREPTWO-3972) Replication - numberOfRetries not exactly fulfilled In-Reply-To: <8920783.3559.1268402208776.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <23452885.8898.1269016188501.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3972?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain P?lissier reopened HREPTWO-3972: ---------------------------------------- > Replication - numberOfRetries not exactly fulfilled > --------------------------------------------------- > > Key: HREPTWO-3972 > URL: http://issues.onehippo.com/browse/HREPTWO-3972 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: n/a > Reporter: Sylvain P?lissier > Assignee: Sylvain P?lissier > Priority: Low > Fix For: r2.12.08, r2.13.00 > > Attachments: numberOfRetries .log > > > The Master tries to obtain a session to the RMI host:port that is defined int he web.xml file of the Slave. If for some reason, such as a typo in the above definition, then it is supposed to try again after retryDelay milliseconds as many times as the value of numberOfRetries. > I have forced that the Master could not locate the host of the Slave (Master and Slave are running on two different hosts but in web.xml of the Master, is set to localhost. > I have attached the console output, because although numberOfRetries is set to 5 (default value), it does actually try 1 to 6 times (problem 1), and continues after the sixth retry has failed. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Fri Mar 19 17:33:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Fri Mar 19 17:38:40 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3972) Replication - numberOfRetries not exactly fulfilled In-Reply-To: <8920783.3559.1268402208776.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <4982200.8901.1269016428596.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87606#action_87606 ] Sylvain P?lissier commented on HREPTWO-3972: -------------------------------------------- Still tries 6 times no matter what is configured in replication.xml. > Replication - numberOfRetries not exactly fulfilled > --------------------------------------------------- > > Key: HREPTWO-3972 > URL: http://issues.onehippo.com/browse/HREPTWO-3972 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.07 > Environment: n/a > Reporter: Sylvain P?lissier > Assignee: Sylvain P?lissier > Priority: Low > Fix For: r2.12.08, r2.13.00 > > Attachments: numberOfRetries .log > > > The Master tries to obtain a session to the RMI host:port that is defined int he web.xml file of the Slave. If for some reason, such as a typo in the above definition, then it is supposed to try again after retryDelay milliseconds as many times as the value of numberOfRetries. > I have forced that the Master could not locate the host of the Slave (Master and Slave are running on two different hosts but in web.xml of the Master, is set to localhost. > I have attached the console output, because although numberOfRetries is set to 5 (default value), it does actually try 1 to 6 times (problem 1), and continues after the sixth retry has failed. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Fri Mar 19 17:34:05 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 17:38:59 2010 Subject: [HippoRepos-dev] [22199] hippo-ecm: HREPTWO-3972: numberOfRetries should have been maxRetries Message-ID: <20100319163405.90E3B1C020@svn.vm.castaserver.com> Revision: 22199 Author: bvdschans Date: 2010-03-19 17:34:05 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3972: numberOfRetries should have been maxRetries Modified Paths: -------------- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml Modified: hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml =================================================================== --- hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:26:20 UTC (rev 22198) +++ hippo-ecm/branches/Branch-HREPTWO-v2_12_xx/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:34:05 UTC (rev 22199) @@ -31,7 +31,7 @@ - + From svn-logs at hippocms.org Fri Mar 19 17:34:11 2010 From: svn-logs at hippocms.org (bvdschans) Date: Fri Mar 19 17:39:05 2010 Subject: [HippoRepos-dev] [22200] hippo-ecm: HREPTWO-3972: numberOfRetries should have been maxRetries Message-ID: <20100319163411.053581C020@svn.vm.castaserver.com> Revision: 22200 Author: bvdschans Date: 2010-03-19 17:34:10 +0100 (Fri, 19 Mar 2010) Log Message: ----------- HREPTWO-3972: numberOfRetries should have been maxRetries Modified Paths: -------------- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml Modified: hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml =================================================================== --- hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:34:05 UTC (rev 22199) +++ hippo-ecm/trunk/repository/engine/src/main/resources/org/hippoecm/repository/replication/config/replication-example.xml 2010-03-19 16:34:10 UTC (rev 22200) @@ -31,7 +31,7 @@ - + From svn-logs at hippocms.org Mon Mar 22 09:30:29 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 22 09:35:31 2010 Subject: [HippoRepos-dev] [22201] hippo-ecm: HREPTWO-3864: use relative path from last referenceable node to invoke workflow Message-ID: <20100322083029.7D4B01C021@svn.vm.castaserver.com> Revision: 22201 Author: bvanhalderen Date: 2010-03-22 09:30:29 +0100 (Mon, 22 Mar 2010) Log Message: ----------- HREPTWO-3864: use relative path from last referenceable node to invoke workflow Modified Paths: -------------- hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/WorkflowDescriptorModel.java Modified: hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/WorkflowDescriptorModel.java =================================================================== --- hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/WorkflowDescriptorModel.java 2010-03-19 16:34:10 UTC (rev 22200) +++ hippo-ecm/trunk/addon/workflow/src/main/java/org/hippoecm/addon/workflow/WorkflowDescriptorModel.java 2010-03-22 08:30:29 UTC (rev 22201) @@ -30,13 +30,23 @@ @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; - private String path; + private String uuid; + private String relPath; private String category; public WorkflowDescriptorModel(WorkflowDescriptor descriptor, String category, Node subject) throws RepositoryException { super(descriptor); this.category = category; - this.path = subject.getPath(); + if (subject.isNodeType("mix:referenceable")) { + this.uuid = subject.getUUID(); + this.relPath = null; + } else { + this.uuid = subject.getParent().getUUID(); + this.relPath = subject.getName(); + if(subject.getIndex() > 1) { + this.relPath += "[" + subject.getIndex() + "]"; + } + } } protected Object load() { @@ -58,25 +68,13 @@ } private Node getNode(Session session) throws RepositoryException { - Node node = session.getRootNode(); - String relPath = path.substring(1); - if (node.hasNode(relPath)) { - return node.getNode(path.substring(1)); - } else if (relPath.contains("/")) { - // FIXME should be more intelligent - int pos = relPath.lastIndexOf("/"); - if (pos < 0) { - return null; + try { + Node node = session.getNodeByUUID(uuid); + if(relPath != null) { + node = node.getNode(relPath); } - String name = relPath.substring(pos + 1); - if (name.contains("[")) { - name = name.substring(0, name.lastIndexOf("[")); - } - relPath = relPath.substring(0, pos); - node = node.getNode(relPath); - node = node.getNode(name); return node; - } else { + } catch(RepositoryException ex) { return null; } } From helpdesk at onehippo.com Mon Mar 22 09:33:48 2010 From: helpdesk at onehippo.com (=?UTF-8?Q?JIRA_=28Sylvain_P=C3=A9lissier=29?=) Date: Mon Mar 22 09:38:49 2010 Subject: [HippoRepos-dev] [JIRA] Commented: (HREPTWO-3969) Username / password show up as GET request parameters In-Reply-To: <14405983.2870.1268314248613.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <23272475.9111.1269246828733.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3969?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=87638#action_87638 ] Sylvain P?lissier commented on HREPTWO-3969: -------------------------------------------- I've been trying to reproduce this for a week without succeeding. > Username / password show up as GET request parameters > ----------------------------------------------------- > > Key: HREPTWO-3969 > URL: http://issues.onehippo.com/browse/HREPTWO-3969 > Project: Hippo Repository 2 > Issue Type: Bug > Components: addon-cms-prototype > Affects Versions: r2.12.06 > Environment: Ubuntu 9.10 , Firefox 3.5, NO Virtual machine > Reporter: Dennis Dam > Assignee: Sylvain P?lissier > Fix For: ongoing > > > I started my laptop this morning, opened Firefox (3.5) and still had a Tab open with the CMS login page in it. Then I noticed that the username and password were in the url as request parameters: > http://localhost:8085/cms?username=test-ocw&password=test > I did not type this url manually or anything like that. I don't have a clear reproduction path for this issue. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 22 10:48:06 2010 From: svn-logs at hippocms.org (bvanhalderen) Date: Mon Mar 22 10:53:09 2010 Subject: [HippoRepos-dev] [22202] hippo-ecm: HREPTWO-3915: disallow editing also on scheduled (de) publication requests, Message-ID: <20100322094806.62E231C020@svn.vm.castaserver.com> Revision: 22202 Author: bvanhalderen Date: 2010-03-22 10:48:05 +0100 (Mon, 22 Mar 2010) Log Message: ----------- HREPTWO-3915: disallow editing also on scheduled (de)publication requests, not just on (de)publication requests. Modified Paths: -------------- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/BasicReviewedActionsWorkflowPlugin.java hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicReviewedActionsWorkflowImpl.java hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions/package.jdo Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/BasicReviewedActionsWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/BasicReviewedActionsWorkflowPlugin.java 2010-03-22 08:30:29 UTC (rev 22201) +++ hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/BasicReviewedActionsWorkflowPlugin.java 2010-03-22 09:48:05 UTC (rev 22202) @@ -277,7 +277,7 @@ } Workflow workflow = manager.getWorkflow(workflowDescriptor); Map info = workflow.hints(); - if (info.containsKey("obtainEditableInstanceobtainEditableInstance") && info.get("obtainEditableInstanceobtainEditableInstance") instanceof Boolean && !((Boolean)info.get("obtainEditableInstanceobtainEditableInstance")).booleanValue()) { + if (info.containsKey("obtainEditableInstance") && info.get("obtainEditableInstance") instanceof Boolean && !((Boolean)info.get("obtainEditableInstance")).booleanValue()) { editAction.setVisible(false); } if (info.containsKey("publish") && info.get("publish") instanceof Boolean && !((Boolean)info.get("publish")).booleanValue()) { Modified: hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java 2010-03-22 08:30:29 UTC (rev 22201) +++ hippo-ecm/trunk/addon/reviewed-action/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/FullReviewedActionsWorkflowPlugin.java 2010-03-22 09:48:05 UTC (rev 22202) @@ -492,9 +492,9 @@ } Workflow workflow = manager.getWorkflow(workflowDescriptor); Map info = workflow.hints(); - if (info.containsKey("obtainEditableInstanceobtainEditableInstance") - && info.get("obtainEditableInstanceobtainEditableInstance") instanceof Boolean - && !((Boolean) info.get("obtainEditableInstanceobtainEditableInstance")).booleanValue()) { + if (info.containsKey("obtainEditableInstance") + && info.get("obtainEditableInstance") instanceof Boolean + && !((Boolean) info.get("obtainEditableInstance")).booleanValue()) { editAction.setVisible(false); } if (info.containsKey("publish") && info.get("publish") instanceof Boolean Modified: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicReviewedActionsWorkflowImpl.java =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicReviewedActionsWorkflowImpl.java 2010-03-22 08:30:29 UTC (rev 22201) +++ hippo-ecm/trunk/addon/reviewed-action/repository/src/main/java/org/hippoecm/repository/reviewedactions/BasicReviewedActionsWorkflowImpl.java 2010-03-22 09:48:05 UTC (rev 22202) @@ -41,6 +41,8 @@ protected PublicationRequest current; protected PublicationRequest current2; protected PublicationRequest current3; + protected PublicationRequest current4; + protected PublicationRequest current5; protected PublishableDocument publishedDocument; protected PublishableDocument unpublishedDocument; protected PublishableDocument draftDocument; @@ -55,7 +57,7 @@ boolean locked = false; boolean status = false; boolean pendingRequest; - if (current != null || current2 != null || current3 != null) { + if (current != null || current2 != null || current3 != null || current4 != null || current5 != null) { pendingRequest = true; } else { pendingRequest = false; @@ -103,7 +105,7 @@ if (!editable && PublishableDocument.DRAFT.equals(state)) { info.put("inUseBy", draftDocument.username); } - info.put("obtainEditableInstanceobtainEditableInstance", editable); + info.put("obtainEditableInstance", editable); info.put("publish", publishable); info.put("depublish", depublishable); info.put("delete", deleteable); @@ -117,6 +119,9 @@ public Document obtainEditableInstance() throws WorkflowException { ReviewedActionsWorkflowImpl.log.info("obtain editable instance on document "); if (draftDocument == null) { + if (current != null || current2 != null || current3 != null || current4 != null || current5 != null) { + throw new WorkflowException("unable to edit document with pending operation"); + } try { if (unpublishedDocument != null) { draftDocument = (PublishableDocument) unpublishedDocument.clone(); Modified: hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions/package.jdo =================================================================== --- hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions/package.jdo 2010-03-22 08:30:29 UTC (rev 22201) +++ hippo-ecm/trunk/addon/reviewed-action/repository/src/main/resources/org/hippoecm/repository/reviewedactions/package.jdo 2010-03-22 09:48:05 UTC (rev 22202) @@ -30,6 +30,8 @@ + + From schans at onehippo.com Mon Mar 22 12:09:05 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 22 12:09:05 2010 Subject: [HippoRepos-dev] =?utf-8?q?Hudson_build_became_unstable=3A__Hipp?= =?utf-8?q?o_ECM_Trunk_=C2=BB_Reviewed_action_addon_tests_=231208?= Message-ID: <4162490.01269256146181.JavaMail.hudson@hudson.onehippo.org> See From schans at onehippo.com Mon Mar 22 12:09:08 2010 From: schans at onehippo.com (Hippo Hudson Server) Date: Mon Mar 22 12:09:13 2010 Subject: [HippoRepos-dev] Hudson build became unstable: Hippo ECM Trunk #1208 Message-ID: <29666258.11269256148183.JavaMail.hudson@hudson.onehippo.org> See From helpdesk at onehippo.com Mon Mar 22 12:43:48 2010 From: helpdesk at onehippo.com (JIRA (Vivek Kumar)) Date: Mon Mar 22 12:48:49 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3993) Upgrade module get trigged, once repository is initialized Message-ID: <15154191.9372.1269258228481.JavaMail.jira@jira.vm.castaserver.com> Upgrade module get trigged, once repository is initialized ---------------------------------------------------------- Key: HREPTWO-3993 URL: http://issues.onehippo.com/browse/HREPTWO-3993 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.06 Reporter: Vivek Kumar Upgrade module get trigged, once repository is initialized. This behavior made taxonomy data in inconsistence state and hst web site is not able load taxonomy. As discussed with Frank. This problem should be fixed in repository or have some work around in upgrade modules. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 13:59:48 2010 From: helpdesk at onehippo.com (JIRA (Dennis Dam)) Date: Mon Mar 22 14:04:48 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3994) Removing a user does not remove the user's group subscriptions Message-ID: <23875136.9471.1269262788762.JavaMail.jira@jira.vm.castaserver.com> Removing a user does not remove the user's group subscriptions -------------------------------------------------------------- Key: HREPTWO-3994 URL: http://issues.onehippo.com/browse/HREPTWO-3994 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.08 Reporter: Dennis Dam Assignee: Stephan Westen In the 2.12.08 quickstart war: 1. create a user "test" 2. make the user "test" a member of the "editor" group 3. remove the user "test" result: the user "test" is deleted, but the "editor" group still contains a reference to the user "test" expected: the user "test" should not be referenced anymore, from any group -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 14:17:48 2010 From: helpdesk at onehippo.com (JIRA (Dennis Dam)) Date: Mon Mar 22 14:22:48 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3995) Pressing Save when editing image does not give any feedback Message-ID: <32200286.9505.1269263868564.JavaMail.jira@jira.vm.castaserver.com> Pressing Save when editing image does not give any feedback ----------------------------------------------------------- Key: HREPTWO-3995 URL: http://issues.onehippo.com/browse/HREPTWO-3995 Project: Hippo Repository 2 Issue Type: Improvement Reporter: Dennis Dam Assignee: Stephan Westen In our project we have custom image types, with extra fields for title, alt description, etc. When saving an image, we expect some feedback, like "Image saved" (just an example). A close button (as used for documents) would be clearer perhaps. I can imagine this issue already exists, but I couldn't find it in Jira.. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 14:28:48 2010 From: helpdesk at onehippo.com (JIRA (Vijay Kiran)) Date: Mon Mar 22 14:33:49 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3996) Exception after editing the basedocument in Quick Start WAR Message-ID: <30402316.9548.1269264528774.JavaMail.jira@jira.vm.castaserver.com> Exception after editing the basedocument in Quick Start WAR ----------------------------------------------------------- Key: HREPTWO-3996 URL: http://issues.onehippo.com/browse/HREPTWO-3996 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.08 Reporter: Vijay Kiran 1. Login in to the CMS. 2. Click on Document Browser to goto Document Browser perspective. 3. Select the project's namespace. 4. Click on Base Document 5. Click Edit, Save and Done. 6. The icon indicates that the document has been modified. 7. Select "Update all content" from the popup menu on namespace. 8. In the following "Update content" dialog - click OK. Expected Result: The Update All content dialog should appear and the namespace should be updated properly. Actual Result: The Update content dialog reports error as - Action Failed. Here's the stack trace: javax.jcr.nodetype.ConstraintViolationException: /hippo:namespaces/defaultcontent/basedocument/hipposysedit:prototypes/hipposysedit:prototype: mandatory property {http://www.onehippo.org/jcr/hippostd/nt/2.0}state does not exist at org.apache.jackrabbit.core.ItemImpl.validateTransientItems(ItemImpl.java:458) at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1058) at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) at org.hippoecm.repository.updater.UpdaterEngine.upgrade(UpdaterEngine.java:705) at org.hippoecm.repository.updater.UpdaterEngine.migrate(UpdaterEngine.java:591) at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:144) at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:154) at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:204) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationImpl.invoke(WorkflowManagerImpl.java:788) at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:512) at $Proxy6.updateModel(Unknown Source) at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:93) at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:68) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) at org.hippoecm.frontend.editor.workflow.dialog.RemodelDialog.remodel(RemodelDialog.java:67) at org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent(RemodelWizard.java:84) at org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel$1.respond(AjaxLazyLoadPanel.java:79) at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301) at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418) at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) at org.mortbay.jetty.Server.handle(Server.java:326) at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:923) at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:547) at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409) at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) 22.03.2010 14:27:34 ERROR [org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent():88] Error during workflow execution org.hippoecm.repository.api.WorkflowException: javax.jcr.nodetype.ConstraintViolationException: /hippo:namespaces/defaultcontent/basedocument/hipposysedit:prototypes/hipposysedit:prototype: mandatory property {http://www.onehippo.org/jcr/hippostd/nt/2.0}state does not exist at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:158) at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) at org.hippoecm.frontend.editor.workflow.dialog.RemodelDialog.remodel(RemodelDialog.java:67) at org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent(RemodelWizard.java:84) at org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel$1.respond(AjaxLazyLoadPanel.java:79) at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301) at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418) at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) at org.mortbay.jetty.Server.handle(Server.java:326) at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:923) at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:547) at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409) at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) 22.03.2010 14:27:34 WARN [org.hippoecm.frontend.JcrObservationManager$JcrListener.subscribe():341] Path no longer exists, stopping observation; content/documents/state/draft -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 14:30:48 2010 From: helpdesk at onehippo.com (JIRA (Vijay Kiran)) Date: Mon Mar 22 14:35:49 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3996) Exception after editing the basedocument in Quick Start WAR In-Reply-To: <30402316.9548.1269264528774.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <9000855.9559.1269264648837.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3996?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay Kiran updated HREPTWO-3996: --------------------------------- Assignee: Stephan Westen Environment: Safari Version 4.0.5, Mac OSX 10.6.2, Quickstart running with mvn jetty:run-war > Exception after editing the basedocument in Quick Start WAR > ----------------------------------------------------------- > > Key: HREPTWO-3996 > URL: http://issues.onehippo.com/browse/HREPTWO-3996 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.08 > Environment: Safari Version 4.0.5, Mac OSX 10.6.2, Quickstart running with mvn jetty:run-war > Reporter: Vijay Kiran > Assignee: Stephan Westen > > 1. Login in to the CMS. > 2. Click on Document Browser to goto Document Browser perspective. > 3. Select the project's namespace. > 4. Click on Base Document > 5. Click Edit, Save and Done. > 6. The icon indicates that the document has been modified. > 7. Select "Update all content" from the popup menu on namespace. > 8. In the following "Update content" dialog - click OK. > Expected Result: > The Update All content dialog should appear and the namespace should be updated properly. > Actual Result: > The Update content dialog reports error as - Action Failed. > Here's the stack trace: > javax.jcr.nodetype.ConstraintViolationException: /hippo:namespaces/defaultcontent/basedocument/hipposysedit:prototypes/hipposysedit:prototype: mandatory property {http://www.onehippo.org/jcr/hippostd/nt/2.0}state does not exist > at org.apache.jackrabbit.core.ItemImpl.validateTransientItems(ItemImpl.java:458) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1058) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.updater.UpdaterEngine.upgrade(UpdaterEngine.java:705) > at org.hippoecm.repository.updater.UpdaterEngine.migrate(UpdaterEngine.java:591) > at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:144) > at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:154) > at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:204) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationImpl.invoke(WorkflowManagerImpl.java:788) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:512) > at $Proxy6.updateModel(Unknown Source) > at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:93) > at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:68) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelDialog.remodel(RemodelDialog.java:67) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent(RemodelWizard.java:84) > at org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel$1.respond(AjaxLazyLoadPanel.java:79) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) > at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) > at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) > at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) > at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418) > at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) > at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) > at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) > at org.mortbay.jetty.Server.handle(Server.java:326) > at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) > at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:923) > at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:547) > at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) > at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) > at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409) > at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) > 22.03.2010 14:27:34 ERROR [org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent():88] Error during workflow execution > org.hippoecm.repository.api.WorkflowException: javax.jcr.nodetype.ConstraintViolationException: /hippo:namespaces/defaultcontent/basedocument/hipposysedit:prototypes/hipposysedit:prototype: mandatory property {http://www.onehippo.org/jcr/hippostd/nt/2.0}state does not exist > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:158) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelDialog.remodel(RemodelDialog.java:67) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent(RemodelWizard.java:84) > at org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel$1.respond(AjaxLazyLoadPanel.java:79) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) > at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) > at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) > at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) > at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418) > at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) > at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) > at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) > at org.mortbay.jetty.Server.handle(Server.java:326) > at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) > at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:923) > at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:547) > at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) > at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) > at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409) > at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) > 22.03.2010 14:27:34 WARN [org.hippoecm.frontend.JcrObservationManager$JcrListener.subscribe():341] Path no longer exists, stopping observation; content/documents/state/draft -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 15:30:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 22 15:35:50 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3994) Removing a user does not remove the user's group subscriptions In-Reply-To: <23875136.9471.1269262788762.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <7460656.9718.1269268248743.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3994?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3994: ------------------------------------ Assignee: Bart van der Schans (was: Stephan Westen) Fix Version/s: r2.12.09 r2.13.00 > Removing a user does not remove the user's group subscriptions > -------------------------------------------------------------- > > Key: HREPTWO-3994 > URL: http://issues.onehippo.com/browse/HREPTWO-3994 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.08 > Reporter: Dennis Dam > Assignee: Bart van der Schans > Fix For: r2.12.09, r2.13.00 > > > In the 2.12.08 quickstart war: > 1. create a user "test" > 2. make the user "test" a member of the "editor" group > 3. remove the user "test" > result: > the user "test" is deleted, but the "editor" group still contains a reference to the user "test" > expected: > the user "test" should not be referenced anymore, from any group -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 15:32:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 22 15:37:49 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3996) Exception after editing the basedocument in Quick Start WAR In-Reply-To: <30402316.9548.1269264528774.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <24206566.9722.1269268368737.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3996?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3996: ------------------------------------ Assignee: Frank van Lankvelt (was: Stephan Westen) Fix Version/s: r2.12.09 r2.13.00 Priority: Blocker (was: Normal) > Exception after editing the basedocument in Quick Start WAR > ----------------------------------------------------------- > > Key: HREPTWO-3996 > URL: http://issues.onehippo.com/browse/HREPTWO-3996 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.12.08 > Environment: Safari Version 4.0.5, Mac OSX 10.6.2, Quickstart running with mvn jetty:run-war > Reporter: Vijay Kiran > Assignee: Frank van Lankvelt > Priority: Blocker > Fix For: r2.12.09, r2.13.00 > > > 1. Login in to the CMS. > 2. Click on Document Browser to goto Document Browser perspective. > 3. Select the project's namespace. > 4. Click on Base Document > 5. Click Edit, Save and Done. > 6. The icon indicates that the document has been modified. > 7. Select "Update all content" from the popup menu on namespace. > 8. In the following "Update content" dialog - click OK. > Expected Result: > The Update All content dialog should appear and the namespace should be updated properly. > Actual Result: > The Update content dialog reports error as - Action Failed. > Here's the stack trace: > javax.jcr.nodetype.ConstraintViolationException: /hippo:namespaces/defaultcontent/basedocument/hipposysedit:prototypes/hipposysedit:prototype: mandatory property {http://www.onehippo.org/jcr/hippostd/nt/2.0}state does not exist > at org.apache.jackrabbit.core.ItemImpl.validateTransientItems(ItemImpl.java:458) > at org.apache.jackrabbit.core.ItemImpl.save(ItemImpl.java:1058) > at org.apache.jackrabbit.core.SessionImpl.save(SessionImpl.java:858) > at org.hippoecm.repository.decorating.SessionDecorator.save(SessionDecorator.java:202) > at org.hippoecm.repository.impl.SessionDecorator.save(SessionDecorator.java:177) > at org.hippoecm.repository.updater.UpdaterEngine.upgrade(UpdaterEngine.java:705) > at org.hippoecm.repository.updater.UpdaterEngine.migrate(UpdaterEngine.java:591) > at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:144) > at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:154) > at org.hippoecm.repository.standardworkflow.RepositoryWorkflowImpl.updateModel(RepositoryWorkflowImpl.java:204) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) > at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) > at java.lang.reflect.Method.invoke(Method.java:597) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationImpl.invoke(WorkflowManagerImpl.java:788) > at org.hippoecm.repository.impl.WorkflowManagerImpl$WorkflowInvocationHandler.invoke(WorkflowManagerImpl.java:512) > at $Proxy6.updateModel(Unknown Source) > at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:93) > at org.hippoecm.frontend.editor.workflow.RemodelWorkflowPlugin$1.execute(RemodelWorkflowPlugin.java:68) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:156) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelDialog.remodel(RemodelDialog.java:67) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent(RemodelWizard.java:84) > at org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel$1.respond(AjaxLazyLoadPanel.java:79) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) > at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) > at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) > at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) > at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418) > at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) > at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) > at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) > at org.mortbay.jetty.Server.handle(Server.java:326) > at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) > at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:923) > at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:547) > at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) > at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) > at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409) > at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) > 22.03.2010 14:27:34 ERROR [org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent():88] Error during workflow execution > org.hippoecm.repository.api.WorkflowException: javax.jcr.nodetype.ConstraintViolationException: /hippo:namespaces/defaultcontent/basedocument/hipposysedit:prototypes/hipposysedit:prototype: mandatory property {http://www.onehippo.org/jcr/hippostd/nt/2.0}state does not exist > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction.execute(CompatibilityWorkflowPlugin.java:158) > at org.hippoecm.addon.workflow.CompatibilityWorkflowPlugin$WorkflowAction$WorkflowDialog.execute(CompatibilityWorkflowPlugin.java:219) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelDialog.remodel(RemodelDialog.java:67) > at org.hippoecm.frontend.editor.workflow.dialog.RemodelWizard$Step2$1.getLazyLoadComponent(RemodelWizard.java:84) > at org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel$1.respond(AjaxLazyLoadPanel.java:79) > at org.apache.wicket.ajax.AbstractDefaultAjaxBehavior.onRequest(AbstractDefaultAjaxBehavior.java:299) > at org.apache.wicket.request.target.component.listener.BehaviorRequestTarget.processEvents(BehaviorRequestTarget.java:119) > at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) > at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:34) > at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) > at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) > at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) > at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) > at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) > at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) > at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) > at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) > at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) > at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) > at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) > at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:418) > at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) > at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) > at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) > at org.mortbay.jetty.Server.handle(Server.java:326) > at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) > at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:923) > at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:547) > at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) > at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) > at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:409) > at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) > 22.03.2010 14:27:34 WARN [org.hippoecm.frontend.JcrObservationManager$JcrListener.subscribe():341] Path no longer exists, stopping observation; content/documents/state/draft -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 15:52:48 2010 From: helpdesk at onehippo.com (JIRA (Stephan Westen)) Date: Mon Mar 22 15:57:49 2010 Subject: [HippoRepos-dev] [JIRA] Updated: (HREPTWO-3990) IE7: internal links are broken after save In-Reply-To: <26555376.8441.1269000408578.JavaMail.jira@jira.vm.castaserver.com> Message-ID: <14645094.9764.1269269568536.JavaMail.jira@jira.vm.castaserver.com> [ http://issues.onehippo.com/browse/HREPTWO-3990?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Stephan Westen updated HREPTWO-3990: ------------------------------------ Fix Version/s: r2.12.09 > IE7: internal links are broken after save > ----------------------------------------- > > Key: HREPTWO-3990 > URL: http://issues.onehippo.com/browse/HREPTWO-3990 > Project: Hippo Repository 2 > Issue Type: Bug > Affects Versions: r2.09.07, r2.12.07 > Environment: Windows: IE7 > Reporter: Arthur Bogaart > Assignee: Arthur Bogaart > Priority: Top > Fix For: r2.09.08, r2.12.09, r2.13.00 > > > When saving a Xinha field with an existing internal link, IE7 seems to make the relative a@href value absolute, ie: becomes which breaks the internal link. The LinkProcessor will also remove the facet-select. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From helpdesk at onehippo.com Mon Mar 22 16:05:48 2010 From: helpdesk at onehippo.com (JIRA (Bartosz Oudekerk)) Date: Mon Mar 22 16:10:49 2010 Subject: [HippoRepos-dev] [JIRA] Created: (HREPTWO-3997) BrowserCheckPlugin crashes on some (firefox) versions Message-ID: <8632402.9794.1269270348639.JavaMail.jira@jira.vm.castaserver.com> BrowserCheckPlugin crashes on some (firefox) versions ----------------------------------------------------- Key: HREPTWO-3997 URL: http://issues.onehippo.com/browse/HREPTWO-3997 Project: Hippo Repository 2 Issue Type: Bug Affects Versions: r2.12.08 Reporter: Bartosz Oudekerk Priority: High The following browser string returns a 500 error in tomcat: 192.168.250.229 - - [22/Mar/2010:16:02:21 +0100] "GET / HTTP/1.1" 500 1000 "-" "Mozilla/5.0 (Windows; U; Windows NT 5.1; nl; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)" 22.03.2010 16:02:24 ERROR [org.apache.wicket.RequestCycle.logRuntimeException():1521] 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.createPage(DefaultPageFactory.java:212) at org.apache.wicket.session.DefaultPageFactory.newPage(DefaultPageFactory.java:57) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.newPage(BookmarkablePageRequestTarget.java:299) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.getPage(BookmarkablePageRequestTarget.java:321) at org.apache.wicket.request.target.component.BookmarkablePageRequestTarget.processEvents(BookmarkablePageRequestTarget.java:234) at org.apache.wicket.request.AbstractRequestCycleProcessor.processEvents(AbstractRequestCycleProcessor.java:92) at org.hippoecm.frontend.PluginRequestCycleProcessor.processEvents(PluginRequestCycleProcessor.java:31) at org.apache.wicket.RequestCycle.processEventsAndRespond(RequestCycle.java:1250) at org.apache.wicket.RequestCycle.step(RequestCycle.java:1329) at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1428) at org.apache.wicket.RequestCycle.request(RequestCycle.java:545) at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:468) at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:301) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hippoecm.frontend.plugins.login.ConcurrentLoginFilter.doFilter(ConcurrentLoginFilter.java:54) 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:293) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:849) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:454) at java.lang.Thread.run(Thread.java:619) 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:513) at org.apache.wicket.session.DefaultPageFactory.createPage(DefaultPageFactory.java:192) ... 27 more Caused by: java.lang.NumberFormatException: For input string: "6 (" at java.lang.NumberFormatException.forInputString(NumberFormatException.java:48) at java.lang.Integer.parseInt(Integer.java:458) at java.lang.Integer.parseInt(Integer.java:499) at org.hippoecm.frontend.plugins.standards.behaviors.BrowserCheckPlugin$WicketBrowserInfo.parseMajorMinor(BrowserCheckPlugin.java:218) at org.hippoecm.frontend.plugins.standards.behaviors.BrowserCheckPlugin$WicketBrowserInfo.setVersions(BrowserCheckPlugin.java:210) at org.hippoecm.frontend.plugins.standards.behaviors.BrowserCheckPlugin$WicketBrowserInfo.(BrowserCheckPlugin.java:187) at org.hippoecm.frontend.plugins.standards.behaviors.BrowserCheckPlugin.bind(BrowserCheckPlugin.java:268) at org.apache.wicket.Component.add(Component.java:970) at org.hippoecm.frontend.service.render.AbstractRenderService$2.onServiceAdded(AbstractRenderService.java:210) at org.hippoecm.frontend.service.render.AbstractRenderService$2.onServiceAdded(AbstractRenderService.java:196) at org.hippoecm.frontend.service.ServiceTracker.addService(ServiceTracker.java:35) at org.hippoecm.frontend.plugin.impl.PluginManager.internalRegisterService(PluginManager.java:268) at org.hippoecm.frontend.plugin.impl.ServiceRegistration.notifyTrackers(ServiceRegistration.java:57) at org.hippoecm.frontend.plugin.impl.PluginContext.connect(PluginContext.java:294) at org.hippoecm.frontend.plugin.impl.PluginManager.start(PluginManager.java:85) at org.hippoecm.frontend.plugin.impl.PluginContext.start(PluginContext.java:316) at org.hippoecm.frontend.plugin.impl.ClusterControl.start(ClusterControl.java:111) at org.hippoecm.frontend.Home.(Home.java:112) at org.hippoecm.frontend.Home.(Home.java:66) ... 32 more -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.onehippo.com/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira From svn-logs at hippocms.org Mon Mar 22 21:08:16 2010 From: svn-logs at hippocms.org (fvlankvelt) Date: Mon Mar 22 21:13:23 2010 Subject: [HippoRepos-dev] [22205] hippo-ecm: HREPTWO-3961: extract rich text model from storage and presentation Message-ID: <20100322200816.67CF61C020@svn.vm.castaserver.com> Revision: 22205 Author: fvlankvelt Date: 2010-03-22 21:08:15 +0100 (Mon, 22 Mar 2010) Log Message: ----------- HREPTWO-3961: extract rich text model from storage and presentation Knowledge of JCR is now restricted to the JCR factories, the link/image pickers and dragdrop. Modified Paths: -------------- hippo-ecm/trunk/addon/xinha-frontend/pom.xml 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/DiffModel.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaNodePlugin.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java 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/dialog/AbstractXinhaDialog.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/htmlcleaner/HtmlCleanerPlugin.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/editormanager-debug.js hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImage.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImageService.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/InternalXinhaLink.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLink.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLinkService.java Added Paths: ----------- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IHtmlCleanerService.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextImageFactory.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextLinkFactory.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextArea.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextImage.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextLink.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextModel.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessor.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextUtil.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextImageFactory.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextLinkFactory.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/RichTextFacetHelper.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/PrefixingModel.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/AbstractPersistedMap.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/DocumentLink.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/IPersisted.java hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/ hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessorTest.java hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/jcr/ hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextLinkFactoryTest.java hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/xinha/DiffModelTest.java Removed Paths: ------------- 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/XinhaHtmlProcessor.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaUtil.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractPersistedMap.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/DocumentLink.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/IPersistedMap.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/XinhaFacetHelper.java hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/ImageItemFactory.java hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/xinha/HtmlProcessorTest.java hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/xinha/LinkServiceTest.java Modified: hippo-ecm/trunk/addon/xinha-frontend/pom.xml =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/pom.xml 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/pom.xml 2010-03-22 20:08:15 UTC (rev 22205) @@ -74,6 +74,12 @@ xerces xercesImpl 2.8.1 + + + xml-apis + xml-apis + + org.hippoecm Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IHtmlCleanerService.java (from rev 22152, 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/richtext/IHtmlCleanerService.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IHtmlCleanerService.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,24 @@ +/* + * 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.richtext; + +import org.apache.wicket.IClusterable; + +public interface IHtmlCleanerService extends IClusterable { + final static String SVN_ID = "$Id$"; + + String clean(String value) throws Exception; +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IHtmlCleanerService.java ___________________________________________________________________ Added: svn:keywords + Id Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextImageFactory.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextImageFactory.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextImageFactory.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,28 @@ +/* + * Copyright 2010 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.richtext; + +import org.apache.wicket.model.IDetachable; + +public interface IRichTextImageFactory extends IDetachable { + + boolean isValid(IDetachable targetId); + + RichTextImage loadImageItem(String path); + + RichTextImage createImageItem(IDetachable model); + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextImageFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextLinkFactory.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextLinkFactory.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextLinkFactory.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,32 @@ +/* + * Copyright 2010 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.richtext; + +import java.util.Set; + +import org.apache.wicket.model.IDetachable; + +public interface IRichTextLinkFactory extends IDetachable { + + void cleanup(Set references); + + boolean isValid(IDetachable targetId); + + RichTextLink createLink(IDetachable targetId); + + RichTextLink loadLink(String relPath); + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/IRichTextLinkFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextArea.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextArea.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextArea.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,88 @@ +/* + * Copyright 2010 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.richtext; + +import org.apache.wicket.Session; +import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.behavior.AbstractAjaxBehavior; +import org.apache.wicket.markup.ComponentTag; +import org.apache.wicket.markup.html.form.TextArea; +import org.apache.wicket.model.IModel; + +public class RichTextArea extends TextArea { + private static final long serialVersionUID = 1L; + + private AbstractAjaxBehavior callback; + + private String width = "1px"; + private String height = "1px"; + + public RichTextArea(String id, IModel model) { + super(id, model); + + setOutputMarkupId(true); + setVisible(true); + setMarkupId("xinha" + Integer.valueOf(Session.get().nextSequenceValue())); + + // Auto-save callback + add(callback = new AbstractDefaultAjaxBehavior() { + private static final long serialVersionUID = 1L; + + @Override + public void respond(AjaxRequestTarget target) { + processInput(); + } + }); + } + + public String getCallbackUrl() { + return callback.getCallbackUrl().toString(); + } + + @Override + protected void onComponentTag(final ComponentTag tag) { + StringBuilder sb = new StringBuilder(); + sb.append("width: "); + sb.append(width); + sb.append(";"); + + sb.append("height: "); + sb.append(height); + sb.append(";"); + + sb.append("display: none;"); + tag.put("style", sb.toString()); + super.onComponentTag(tag); + } + + public void setHeight(String height) { + this.height = height; + } + + public String getHeight() { + return height; + } + + public void setWidth(String width) { + this.width = width; + } + + public String getWidth() { + return width; + } + +} \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextArea.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextImage.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextImage.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextImage.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,130 @@ +/* + * Copyright 2010 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.richtext; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.wicket.IClusterable; +import org.hippoecm.frontend.model.JcrNodeModel; + +/** + * This class represents an image resource that a rich text field has a reference to. + * It handles url generation and maintains the facetname attribute. + */ +public abstract class RichTextImage implements IClusterable { + private static final long serialVersionUID = 1L; + + private String parentPath; + private String path; + private String uuid; + private String nodeName; + private String facetName; + private String primaryItemName; + private List resourceDefinitions; + private String selectedResourceDefinition; + + public RichTextImage(String path, String uuid, String primaryItemName, String nodeName, + List resourceDefinitions, String nodePath) { + this.path = path; + this.uuid = uuid; + this.primaryItemName = primaryItemName; + this.facetName = nodeName; + this.nodeName = nodeName; + this.parentPath = nodePath; + this.resourceDefinitions = resourceDefinitions != null ? resourceDefinitions : new ArrayList(); + if (this.resourceDefinitions.size() == 1) { + selectedResourceDefinition = this.resourceDefinitions.get(0); + } + } + + public String getUuid() { + return uuid; + } + + public String getPrimaryUrl() { + return RichTextUtil.encode("binaries" + path + "/" + primaryItemName); + } + + public List getResourceDefinitions() { + return resourceDefinitions; + } + + public String getNodeName() { + return nodeName; + } + + public String getSelectedResourceDefinition() { + return selectedResourceDefinition; + } + + public void setSelectedResourceDefinition(String selectedResourceDefinition) { + this.selectedResourceDefinition = selectedResourceDefinition; + } + + public void setFacetName(String facet) { + this.facetName = facet; + } + + public String getFacetName() { + return facetName; + } + + public String getFacetSelectPath() { + if (selectedResourceDefinition != null) { + return facetName + "/{_document}/" + selectedResourceDefinition; + } else { + return facetName; + } + } + + public String getUrl() { + String url = null; + String parentUrl = "binaries" + parentPath + "/"; + + if (!RichTextUtil.isPortletContext()) { + if (selectedResourceDefinition != null) { + url = RichTextUtil.encode(parentUrl + facetName + "/{_document}/" + selectedResourceDefinition); + } else { + url = RichTextUtil.encode(parentUrl + facetName); + } + } else { + parentUrl = RichTextUtil.encodeResourceURL(RichTextUtil.encode(parentUrl)); + url = + new StringBuilder(80).append(parentUrl) + .append(parentUrl.indexOf('?') == -1 ? '?' : '&') + .append("_path=") + .append(getFacetSelectPath()) + .toString(); + } + + return url; + } + + public boolean isValid() { + return path != null && uuid != null + && !(resourceDefinitions.size() > 1 && selectedResourceDefinition == null); + } + + public JcrNodeModel getNodeModel() { + return new JcrNodeModel(path); + } + + public abstract boolean save(); + + public abstract void delete(); + +} \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextImage.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextLink.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextLink.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextLink.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,48 @@ +/* + * Copyright 2010 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.richtext; + +import org.apache.wicket.IClusterable; +import org.apache.wicket.model.IDetachable; + +public abstract class RichTextLink implements IClusterable { + private static final long serialVersionUID = 1L; + + private String name; + private IDetachable model; + + public RichTextLink(IDetachable model, String name) { + this.model = model; + this.name = name; + } + + public IDetachable getTargetId() { + return model; + } + + public String getName() { + return name; + } + + public void setName(String nodeName) { + this.name = nodeName; + } + + abstract public boolean save(); + + abstract public void delete(); + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextLink.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextModel.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextModel.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextModel.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,88 @@ +/* + * Copyright 2010 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.richtext; + +import java.util.Set; + +import org.apache.wicket.model.IModel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RichTextModel implements IModel { + private static final long serialVersionUID = 1L; + + static final Logger log = LoggerFactory.getLogger(RichTextModel.class); + + private IModel valueModel; + private IHtmlCleanerService cleaner; + private IRichTextLinkFactory linkFactory; + + public RichTextModel(IModel valueModel) { + this.valueModel = valueModel; + } + + public String getObject() { + return valueModel.getObject(); + } + + public void setObject(String value) { + try { + String cleanedValue = clean(value); + if (cleanedValue != null) { + removeLinks(cleanedValue); + } + valueModel.setObject(cleanedValue); + } catch (Exception e) { + log.error("Exception caught during editor creation while cleaning value: " + value, e); + } + } + + public void detach() { + valueModel.detach(); + linkFactory.detach(); + } + + public void setCleaner(IHtmlCleanerService cleaner) { + this.cleaner = cleaner; + } + + public IHtmlCleanerService getCleaner() { + return cleaner; + } + + public void setLinkFactory(IRichTextLinkFactory linkService) { + this.linkFactory = linkService; + } + + public IRichTextLinkFactory getLinkFactory() { + return linkFactory; + } + + private String clean(final String value) throws Exception { + if (cleaner != null) { + return cleaner.clean(value); + } + return value; + } + + private void removeLinks(String text) { + if (getLinkFactory() != null) { + Set linkNames = RichTextProcessor.getInternalLinks(text); + linkFactory.cleanup(linkNames); + } + } + +} \ No newline at end of file Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextModel.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessor.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaHtmlProcessor.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessor.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessor.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,160 @@ +/* + * 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.richtext; + +import java.util.Set; +import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.wicket.protocol.http.WicketURLDecoder; +import org.hippoecm.frontend.plugins.xinha.services.links.ExternalXinhaLink; + +public class RichTextProcessor { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static Pattern LINK_AND_IMAGES_PATTERN = Pattern.compile("<(a|img)(\\s+)(.*?)(src|href)=\"(.*?)\"(.*?)>", + Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL); + private static Pattern IMG_PATTERN = Pattern.compile("]+>", Pattern.CASE_INSENSITIVE); + private static Pattern SRC_PATTERN = Pattern.compile("src=\"([^\"]+)\"", Pattern.CASE_INSENSITIVE); + private static Pattern FACET_SELECT_PATTERN = Pattern.compile("facetselect=\"([^\"]+)\"", Pattern.CASE_INSENSITIVE); + + private static Pattern LINK_PATTERN = Pattern.compile("]+>", Pattern.CASE_INSENSITIVE); + private static Pattern HREF_PATTERN = Pattern.compile("href=\"[^\"]+\"", Pattern.CASE_INSENSITIVE); + + /** + * Prefix the targets of relative image links in a text. Text and prefix may + * neither be null. + */ + public static String prefixImageLinks(String text, String prefix) { + StringBuffer processed = new StringBuffer(); + Matcher m = IMG_PATTERN.matcher(text); + + while (m.find()) { + String img = m.group(); + StringBuffer newImg = new StringBuffer(); + Matcher s = SRC_PATTERN.matcher(img); + + if (s.find()) { + String src = s.group(); + Matcher fs = FACET_SELECT_PATTERN.matcher(img); + + if (fs.find()) { + String link = fs.group(1); + + if (!link.startsWith("http:") && !link.startsWith("https:")) { + if (RichTextUtil.isPortletContext()) { + s.appendReplacement(newImg, ("src=\"" + prefix + "?_path=" + link + "\"").replace("\\", + "\\\\").replace("$", "\\$")); + } else { + s.appendReplacement(newImg, ("src=\"" + prefix + link + "\"").replace("\\", "\\\\") + .replace("$", "\\$")); + } + } else { + s.appendReplacement(newImg, src.replace("\\", "\\\\").replace("$", "\\$")); + } + } else { + String link = s.group(1); + + if (!link.startsWith("http:") && !link.startsWith("https:")) { + s.appendReplacement(newImg, ("src=\"" + prefix + link + "\"").replace("\\", "\\\\").replace( + "$", "\\$")); + } else { + s.appendReplacement(newImg, src.replace("\\", "\\\\").replace("$", "\\$")); + } + } + } + + s.appendTail(newImg); + m.appendReplacement(processed, newImg.toString().replace("\\", "\\\\").replace("$", "\\$")); + } + + m.appendTail(processed); + + return processed.toString(); + } + + /** + * Return the internal links, i.e. the links to other documents / images / assets + * in the text. The text may not be null. + */ + static Set getInternalLinks(String text) { + Set links = new TreeSet(); + Matcher m = LINK_AND_IMAGES_PATTERN.matcher(text); + while (m.find()) { + String link = m.group(5); + if (isExternalLink(link)) { + continue; + } + String linkName; + if (link.indexOf('/') > 0) { + linkName = link.substring(0, link.indexOf('/')); + } else { + linkName = link; + } + linkName = WicketURLDecoder.PATH_INSTANCE.decode(linkName); + links.add(linkName); + } + return links; + } + + public static String decorateLinks(String text, ILinkDecorator decorator) { + + StringBuffer processed = new StringBuffer(); + Matcher m = LINK_PATTERN.matcher(text); + while (m.find()) { + String anchor = m.group(); + StringBuffer newAnchor = new StringBuffer(); + Matcher s = HREF_PATTERN.matcher(anchor); + if (s.find()) { + String href = s.group(); + // skip href= + String link = href.substring(5); + + if (link.charAt(0) == '"') { + link = link.substring(1); + } + if (link.charAt(link.length() - 1) == '"') { + link = link.substring(0, link.length() - 1); + } + + link = isExternalLink(link) ? decorator.externalLink(link) : decorator.internalLink(link); + s.appendReplacement(newAnchor, link.replace("\\", "\\\\").replace("$", "\\$")); + } + s.appendTail(newAnchor); + m.appendReplacement(processed, newAnchor.toString().replace("\\", "\\\\").replace("$", "\\$")); + } + m.appendTail(processed); + + return processed.toString(); + } + + private static boolean isExternalLink(String link) { + for (String protocol : ExternalXinhaLink.PROTOCOLS) { + if (link.startsWith(protocol)) { + return true; + } + } + return false; + } + + public static interface ILinkDecorator { + String internalLink(String link); + String externalLink(String link); + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextUtil.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaUtil.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextUtil.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextUtil.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,66 @@ +/* + * 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.richtext; + +import org.apache.commons.lang.StringUtils; +import org.apache.wicket.RequestContext; +import org.apache.wicket.protocol.http.WicketURLDecoder; +import org.apache.wicket.protocol.http.WicketURLEncoder; +import org.apache.wicket.protocol.http.portlet.PortletRequestContext; + +public class RichTextUtil { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + public static final String encode(String path) { + String[] elements = StringUtils.split(path, '/'); + for (int i = 0; i < elements.length; i++) { + elements[i] = WicketURLEncoder.PATH_INSTANCE.encode(elements[i], "UTF-8"); + } + return StringUtils.join(elements, '/'); + } + + public static final String decode(String path) { + String[] elements = StringUtils.split(path, '/'); + for (int i = 0; i < elements.length; i++) { + elements[i] = WicketURLDecoder.PATH_INSTANCE.decode(elements[i], "UTF-8"); + } + return StringUtils.join(elements, '/'); + } + + public static final String encodeResourceURL(String url) { + return encodeResourceURL(url, true); + } + + public static final String encodeResourceURL(String url, boolean useRelativeURL) { + // if it is in portlet environment, just wrap the url in portlet resource url. + RequestContext requestContext = RequestContext.get(); + if (requestContext.isPortletRequest()) { + url = ((PortletRequestContext) requestContext).encodeResourceURL(url).toString(); + if (useRelativeURL && (url.startsWith("http:") || url.startsWith("https:"))) { + int offset = url.indexOf('/', 8); + if (offset != -1) { + url = url.substring(offset); + } + } + } + return url; + } + + public static final boolean isPortletContext() { + return RequestContext.get().isPortletRequest(); + } +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/RichTextUtil.java ___________________________________________________________________ Added: svn:keywords + Id Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextImageFactory.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/ImageItemFactory.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextImageFactory.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextImageFactory.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,202 @@ +/* + * 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.richtext.jcr; + +import java.util.ArrayList; +import java.util.List; + +import javax.jcr.AccessDeniedException; +import javax.jcr.ItemNotFoundException; +import javax.jcr.Node; +import javax.jcr.PathNotFoundException; +import javax.jcr.RepositoryException; +import javax.jcr.UnsupportedRepositoryOperationException; +import javax.jcr.nodetype.NodeDefinition; +import javax.jcr.nodetype.NodeType; + +import org.apache.wicket.Session; +import org.apache.wicket.model.IDetachable; +import org.apache.wicket.util.string.PrependingStringBuffer; +import org.apache.wicket.util.string.Strings; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.plugins.richtext.IRichTextImageFactory; +import org.hippoecm.frontend.plugins.richtext.RichTextImage; +import org.hippoecm.frontend.session.UserSession; +import org.hippoecm.repository.api.HippoNode; +import org.hippoecm.repository.api.HippoNodeType; +import org.hippoecm.repository.api.HippoWorkspace; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This class handles the creation and storage of RichTextImages in the JCR repository. + */ +public class JcrRichTextImageFactory implements IRichTextImageFactory { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private final static Logger log = LoggerFactory.getLogger(JcrRichTextImageFactory.class); + + private JcrNodeModel nodeModel; + + public JcrRichTextImageFactory(JcrNodeModel nodeModel) { + this.nodeModel = nodeModel; + } + + /** + * Load an existing RichTextImage, using the provided path. The path is the relative + * path to the facetselect that points to the handle of the image. + */ + public RichTextImage loadImageItem(String path) { + // find the nodename of the facetselect + if (!Strings.isEmpty(path)) { + try { + javax.jcr.Session session = ((UserSession) Session.get()).getJcrSession(); + HippoWorkspace workspace = (HippoWorkspace) session.getWorkspace(); + Node root = nodeModel.getNode(); + Node node = ((HippoNode) workspace.getHierarchyResolver().getNode(root, path)) + .getCanonicalNode(); + if (node != null) { + PrependingStringBuffer relativePathBuilder = new PrependingStringBuffer(); + while (!node.equals(root) && !node.isNodeType(HippoNodeType.NT_HANDLE)) { + node = node.getParent(); + if (relativePathBuilder.length() > 0) { + relativePathBuilder.prepend('/'); + } + relativePathBuilder.prepend(path.substring(path.lastIndexOf('/') + 1)); + path = path.substring(0, path.lastIndexOf('/')); + } + return createImageItem(node, relativePathBuilder.toString()); + } + } catch (PathNotFoundException e) { + log.error("Error retrieving canonical node for imageNode[" + path + "]", e); + } catch (RepositoryException e) { + log.error("Error retrieving canonical node for imageNode[" + path + "]", e); + } + } + return null; + } + + public RichTextImage createImageItem(IDetachable target) { + JcrNodeModel model = (JcrNodeModel) target; + if (model != null) { + try { + Node node = model.getNode(); + return createImageItem(node, null); + } catch (UnsupportedRepositoryOperationException e) { + log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); + } catch (ItemNotFoundException e) { + log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); + } catch (AccessDeniedException e) { + log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); + } catch (RepositoryException e) { + log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); + } + } + return null; + } + + public boolean isValid(IDetachable targetId) { + if (!(targetId instanceof JcrNodeModel)) { + return false; + } + JcrNodeModel selectedModel = (JcrNodeModel) targetId; + if (selectedModel == null) { + return false; + } + Node node = selectedModel.getObject(); + if (node == null) { + return false; + } + try { + return node.isNodeType("mix:referenceable"); + } catch (RepositoryException e) { + log.error(e.getMessage()); + return false; + } + } + + /** + * Create a RichTextImage that corresponds to the (physical) handle. + */ + private RichTextImage createImageItem(Node node, String selectedResource) throws UnsupportedRepositoryOperationException, + ItemNotFoundException, AccessDeniedException, RepositoryException { + + NodeType nodetype = node.getPrimaryNodeType(); + if (nodetype.getName().equals("hippo:handle")) { + node = node.getNode(node.getName()); + if (selectedResource != null) { + selectedResource = selectedResource.substring(selectedResource.indexOf('/') + 1); + } + } + + List resourceDefinitions = new ArrayList(); + for (NodeDefinition nd : node.getPrimaryNodeType().getChildNodeDefinitions()) { + if (!nd.getName().equals(node.getPrimaryItem().getName()) && nd.getDefaultPrimaryType() != null + && nd.getDefaultPrimaryType().isNodeType("hippo:resource")) { + resourceDefinitions.add(nd.getName()); + } + } + RichTextImage rti = new RichTextImage(node.getPath(), node.getParent().getUUID(), node.getPrimaryItem().getName(), node + .getName(), resourceDefinitions, nodeModel.getNode().getPath()) { + private static final long serialVersionUID = 1L; + + @Override + public boolean save() { + Node node = nodeModel.getNode(); + try { + String facet = RichTextFacetHelper.createFacet(node, getNodeName(), getUuid()); + if (facet != null && !facet.equals("")) { + setFacetName(facet); + return true; + } + } catch (RepositoryException e) { + log.error("Failed to create facet for " + getNodeName(), e); + } + return false; + } + + @Override + public void delete() { + if (getUuid() != null) { + Node node = nodeModel.getNode(); + String facet = getFacetName(); + try { + if (node.hasNode(facet)) { + Node imgNode = node.getNode(facet); + imgNode.remove(); + node.getSession().save(); + } + } catch (RepositoryException e) { + log.error("An error occured while trying to save new image facetSelect[" + getNodeName() + "]", + e); + } + } + } + }; + if (selectedResource != null) { + rti.setSelectedResourceDefinition(selectedResource); + } + return rti; + } + + public void detach() { + nodeModel.detach(); + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextImageFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextLinkFactory.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextLinkFactory.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextLinkFactory.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,171 @@ +/* + * Copyright 2010 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.richtext.jcr; + +import java.util.Set; + +import javax.jcr.Item; +import javax.jcr.Node; +import javax.jcr.NodeIterator; +import javax.jcr.PathNotFoundException; +import javax.jcr.RepositoryException; + +import org.apache.wicket.model.IDetachable; +import org.hippoecm.frontend.model.JcrNodeModel; +import org.hippoecm.frontend.plugins.richtext.IRichTextLinkFactory; +import org.hippoecm.frontend.plugins.richtext.RichTextLink; +import org.hippoecm.frontend.plugins.richtext.RichTextUtil; +import org.hippoecm.repository.api.HippoNodeType; +import org.hippoecm.repository.api.NodeNameCodec; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class JcrRichTextLinkFactory implements IRichTextLinkFactory { + + private final class InternalRichTextLink extends RichTextLink { + private static final long serialVersionUID = 1L; + + private InternalRichTextLink(JcrNodeModel model, String relPath) throws RepositoryException { + super(model, relPath); + } + + @Override + public void delete() { + try { + nodeModel.getNode().getNode(getName()).remove(); + } catch (RepositoryException e) { + log.error(e.getMessage()); + } + } + + @Override + public boolean save() { + Node node = nodeModel.getNode(); + JcrNodeModel targetNode = (JcrNodeModel) getTargetId(); + if (targetNode != null && targetNode.getNode() != null) { + try { + String uuid = targetNode.getNode().getUUID(); + String name = RichTextFacetHelper.createFacet(node, getName(), uuid); + setName(name); + return true; + } catch (RepositoryException e) { + log.error("Failed to create facet for " + getName(), e); + } + } + return false; + } + } + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private static final long serialVersionUID = 1L; + + private final static Logger log = LoggerFactory.getLogger(JcrRichTextImageFactory.class); + + private JcrNodeModel nodeModel; + + public JcrRichTextLinkFactory(JcrNodeModel nodeModel) { + this.nodeModel = nodeModel; + } + + public RichTextLink loadLink(String relPath) { + if (relPath != null && !"".equals(relPath)) { + relPath = RichTextUtil.decode(relPath); + try { + Node node = nodeModel.getNode(); + if (node.hasNode(relPath)) { + Node linkNode = node.getNode(relPath); + if (linkNode.isNodeType(HippoNodeType.NT_FACETSELECT)) { + String uuid = linkNode.getProperty(HippoNodeType.HIPPO_DOCBASE).getValue().getString(); + Item item = node.getSession().getNodeByUUID(uuid); + if (item != null) { + JcrNodeModel model = new JcrNodeModel(item.getPath()); + return createRichTextLink(relPath, model); + } + } + } + } catch (PathNotFoundException e) { + log.error("Error finding facet node for relative path " + relPath, e); + } catch (RepositoryException e) { + log.error("Error finding facet node for relative path " + relPath, e); + } + } + return null; + } + + private RichTextLink createRichTextLink(final String relPath, JcrNodeModel model) throws RepositoryException { + return new InternalRichTextLink(model, relPath); + } + + /** + * Remove any facetselects that are no longer used. + * + * @param references the current list of link names + */ + public void cleanup(Set references) { + try { + NodeIterator iter = nodeModel.getNode().getNodes(); + while (iter.hasNext()) { + Node child = iter.nextNode(); + if (child.isNodeType(HippoNodeType.NT_FACETSELECT)) { + String name = child.getName(); + if (!references.contains(name)) { + child.remove(); + } + } + } + } catch (RepositoryException ex) { + log.error("Error removing unused links", ex); + } + } + + public RichTextLink createLink(IDetachable targetId) { + JcrNodeModel nodeModel = (JcrNodeModel) targetId; + try { + String name = NodeNameCodec.encode(nodeModel.getNode().getName()); + return new InternalRichTextLink(nodeModel, name); + } catch (RepositoryException e) { + log.error("could not create link", e); + } + return null; + } + + public boolean isValid(IDetachable targetId) { + if (!(targetId instanceof JcrNodeModel)) { + return false; + } + JcrNodeModel selectedModel = (JcrNodeModel) targetId; + if (selectedModel == null) { + return false; + } + Node node = selectedModel.getObject(); + if (node == null) { + return false; + } + try { + return node.isNodeType("mix:referenceable"); + } catch (RepositoryException e) { + log.error(e.getMessage()); + return false; + } + } + + public void detach() { + nodeModel.detach(); + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/JcrRichTextLinkFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/RichTextFacetHelper.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/XinhaFacetHelper.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/RichTextFacetHelper.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/RichTextFacetHelper.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,90 @@ +/* + * 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.richtext.jcr; + +import javax.jcr.ItemExistsException; +import javax.jcr.Node; +import javax.jcr.PathNotFoundException; +import javax.jcr.RepositoryException; +import javax.jcr.lock.LockException; +import javax.jcr.nodetype.ConstraintViolationException; +import javax.jcr.nodetype.NoSuchNodeTypeException; +import javax.jcr.version.VersionException; + +import org.hippoecm.repository.api.HippoNodeType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RichTextFacetHelper { + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + static final Logger log = LoggerFactory.getLogger(RichTextFacetHelper.class); + + private RichTextFacetHelper() { + } + + static String createFacet(Node node, String link, String uuid) throws ItemExistsException, PathNotFoundException, + NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException { + if (uuid == null) { + log.error("uuid is null. Should never be possible for facet"); + return ""; + } + + String linkName = newLinkName(node, link); + + Node facetselect = node.addNode(linkName, HippoNodeType.NT_FACETSELECT); + facetselect.setProperty(HippoNodeType.HIPPO_DOCBASE, uuid); + facetselect.setProperty(HippoNodeType.HIPPO_FACETS, new String[] {}); + facetselect.setProperty(HippoNodeType.HIPPO_MODES, new String[] {}); + facetselect.setProperty(HippoNodeType.HIPPO_VALUES, new String[] {}); + + // save the document (the draft so no problem) + Node document = node.getParent(); + while (document.getDepth() > 0) { + if (document.isNodeType(HippoNodeType.NT_DOCUMENT)) { + if (document.isNew()) { + log.warn("Document is new, saving session"); + document.getSession().save(); + document.getSession().refresh(false); + } else { + document.save(); + document.refresh(false); + } + break; + } + document = document.getParent(); + } + + return linkName; + } + + private static String newLinkName(Node node, String link) throws RepositoryException { + if (!node.hasNode(link)) { + return link; + } + int postfix = 1; + while (true) { + String testLink = link + "_" + postfix; + if (!node.hasNode(testLink)) { + return testLink; + } + postfix++; + } + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/richtext/jcr/RichTextFacetHelper.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native 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 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/AbstractXinhaPlugin.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -23,19 +23,11 @@ import java.util.Map; import java.util.Set; -import javax.jcr.Node; -import javax.jcr.RepositoryException; - import org.apache.wicket.IClusterable; import org.apache.wicket.Page; -import org.apache.wicket.Request; -import org.apache.wicket.RequestCycle; import org.apache.wicket.ResourceReference; -import org.apache.wicket.Session; -import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.behavior.IBehavior; import org.apache.wicket.markup.ComponentTag; @@ -43,38 +35,29 @@ import org.apache.wicket.markup.html.CSSPackageResource; import org.apache.wicket.markup.html.JavascriptPackageResource; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.resources.JavascriptResourceReference; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.apache.wicket.model.ResourceModel; -import org.apache.wicket.protocol.http.WicketURLEncoder; import org.apache.wicket.util.template.PackagedTextTemplate; import org.hippoecm.frontend.Home; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.xinha.XinhaHtmlProcessor.ILinkDecorator; +import org.hippoecm.frontend.plugins.richtext.RichTextArea; +import org.hippoecm.frontend.plugins.richtext.RichTextModel; +import org.hippoecm.frontend.plugins.richtext.RichTextUtil; import org.hippoecm.frontend.plugins.xinha.dialog.XinhaDialogBehavior; -import org.hippoecm.frontend.plugins.xinha.dialog.images.ImagePickerBehavior; 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.json.JsonParser; -import org.hippoecm.frontend.plugins.xinha.services.images.XinhaImageService; -import org.hippoecm.frontend.plugins.xinha.services.links.XinhaLinkService; import org.hippoecm.frontend.plugins.yui.AbstractYuiBehavior; import org.hippoecm.frontend.plugins.yui.header.IYuiContext; import org.hippoecm.frontend.plugins.yui.header.templates.DynamicTextTemplate; -import org.hippoecm.frontend.service.IBrowseService; import org.hippoecm.frontend.service.IEditor; import org.hippoecm.frontend.service.render.HeaderContributorHelper; import org.hippoecm.frontend.service.render.RenderPlugin; -import org.hippoecm.frontend.session.UserSession; -import org.hippoecm.repository.api.HippoNodeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,7 +70,7 @@ static final Logger log = LoggerFactory.getLogger(AbstractXinhaPlugin.class); public static final String XINHA_PARAM_PREFIX = "xinha-param-prefix-"; - private static final String BINARIES_PREFIX = "binaries"; + static final String BINARIES_PREFIX = "binaries"; private static final String[] defaultFormatBlock = { "h1", "h2", "h3", "h4", "h5", "h6", "p", "address", "pre" }; @@ -98,62 +81,80 @@ "xinha_init.js"); private final IEditor.Mode mode; - private XinhaTextArea editor; - private Configuration configuration; + protected RichTextArea editor; + protected final Configuration configuration; //preview behaviors - private PreviewLinksBehavior previewLinksBehavior; private IBehavior startEditorBehavior; private IBehavior previewStyle; //editor behaviors - private InternalLinkBehavior linkPickerBehavior; private ExternalLinkBehavior externalLinkBehavior; - private ImagePickerBehavior imagePickerBehavior; - private XinhaImageService imageService; - private XinhaLinkService linkService; - private JcrNodeModel nodeModel; public AbstractXinhaPlugin(IPluginContext context, final IPluginConfig config) { super(context, config); configuration = new Configuration(config); - context.registerService(configuration, Configuration.class.getName()); - String binariesPath = BINARIES_PREFIX + getNodePath(); - configuration.addProperty("prefix", XinhaUtil.encodeResourceURL(XinhaUtil.encode(binariesPath) + "/")); - configuration.addProperty("isPortletContext", Boolean.toString(XinhaUtil.isPortletContext())); - configuration.addProperty("previewTooltipText", getString("preview.tooltip", null, "Click to edit")); + configuration.addProperty("isPortletContext", Boolean.toString(RichTextUtil.isPortletContext())); configuration.setName(getMarkupId()); mode = IEditor.Mode.fromString(config.getString("mode", "view")); if (IEditor.Mode.EDIT == mode) { + configuration.addProperty("previewTooltipText", getString("preview.tooltip", null, "Click to edit")); add(new EditorManagerBehavior()); } - load(); // dialog functionality for plugins add(JavascriptPackageResource.getHeaderContribution(XINHA_MODAL_JS)); } + @Override + protected void onStart() { + load(); + super.onStart(); + } + + protected IEditor.Mode getMode() { + return mode; + } + private void load() { addOrReplace(IEditor.Mode.EDIT == mode ? configuration.getEditorStarted() ? createEditor("fragment") : createEditablePreview("fragment") : createPreview("fragment")); } - private Fragment createPreview(String fragmentId) { - if (previewLinksBehavior == null) { - add(previewLinksBehavior = new PreviewLinksBehavior()); - } + protected abstract JcrPropertyValueModel getValueModel(); + protected abstract JcrPropertyValueModel getBaseModel(); + + protected IModel newCompareModel() { + return new DiffModel(getBaseModel(), getValueModel()); + } + + protected IModel newViewModel() { + return getValueModel(); + } + + protected RichTextModel newEditModel() { + return new RichTextModel(getValueModel()); + } + + protected Fragment createPreview(String fragmentId) { Fragment fragment = new Fragment(fragmentId, "view", this); IModel model; - if (IEditor.Mode.COMPARE == mode) { - model = new DiffModel(getBaseModel(), getValueModel()); - } else { - model = getValueModel(); + switch (mode) { + case COMPARE: + model = newCompareModel(); + break; + case VIEW: + case EDIT: + model = newViewModel(); + break; + default: + throw new RuntimeException("No model available for mode " + mode); } fragment.add(new WebMarkupContainer("value", model) { private static final long serialVersionUID = 1L; @@ -162,9 +163,7 @@ protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) { String text = (String) getDefaultModelObject(); if (text != null) { - String processed = XinhaHtmlProcessor.prefixImageLinks(text, configuration.getProperty("prefix")); - processed = XinhaHtmlProcessor.decorateLinks(processed, previewLinksBehavior); - replaceComponentTagBody(markupStream, openTag, processed); + replaceComponentTagBody(markupStream, openTag, text); } else { renderComponentTagBody(markupStream, openTag); } @@ -176,7 +175,7 @@ return fragment; } - private Fragment createEditablePreview(String fragmentId) { + protected Fragment createEditablePreview(String fragmentId) { add(startEditorBehavior = new AjaxEventBehavior("onclick") { private static final long serialVersionUID = 1L; @@ -192,7 +191,7 @@ return createPreview(fragmentId); } - private Fragment createEditor(String fragmentId) { + protected Fragment createEditor(String fragmentId) { //remove preview behaviors if (previewStyle != null) { remove(previewStyle); @@ -202,87 +201,19 @@ remove(startEditorBehavior); startEditorBehavior = null; } - if (previewLinksBehavior != null) { - remove(previewLinksBehavior); - previewLinksBehavior = null; - } Fragment fragment = new Fragment(fragmentId, "edit", this); - fragment.add(editor = new XinhaTextArea("value", new XinhaModel(getValueModel()))); + fragment.add(editor = new RichTextArea("value", newEditModel())); + editor.setWidth(getPluginConfig().getString("width", "1px")); + editor.setHeight(getPluginConfig().getString("height", "1px")); configuration.setTextareaName(editor.getMarkupId()); - JcrNodeModel nodeModel = new JcrNodeModel(getValueModel().getJcrPropertymodel().getItemModel().getParentModel()); - imageService = new XinhaImageService(nodeModel) { - private static final long serialVersionUID = 1L; - - @Override - protected String getXinhaName() { - return configuration.getName(); - } - - }; - - linkService = new XinhaLinkService(nodeModel) { - private static final long serialVersionUID = 1L; - - @Override - protected String getXinhaName() { - return configuration.getName(); - } - - }; - IPluginContext context = getPluginContext(); IPluginConfig config = getPluginConfig(); - - editor.add(imagePickerBehavior = new ImagePickerBehavior(context, config - .getPluginConfig("Xinha.plugins.InsertImage"), imageService)); - editor.add(linkPickerBehavior = new InternalLinkBehavior(context, config - .getPluginConfig("Xinha.plugins.CreateLink"), linkService)); editor.add(externalLinkBehavior = new ExternalLinkBehavior(context, config)); - - add(new XinhaDropBehavior(context, config) { - private static final long serialVersionUID = 1L; - - @Override - protected void insertImage(JcrNodeModel model, AjaxRequestTarget target) { - String returnScript = imageService.attach(model); - if (returnScript != null) { - target.getHeaderResponse().renderOnDomReadyJavascript(returnScript); - } - } - - @Override - protected void updateImage(JcrNodeModel model, AjaxRequestTarget target) { - //TODO: check if old image facet select should be deleted - insertImage(model, target); - } - - @Override - protected void insertLink(JcrNodeModel model, AjaxRequestTarget target) { - String returnScript = linkService.attach(model); - if (returnScript != null) { - target.getHeaderResponse().renderOnDomReadyJavascript(returnScript); - } - } - - @Override - protected void updateLink(JcrNodeModel model, AjaxRequestTarget target) { - //TODO: check if old link facet select should be deleted - insertLink(model, target); - } - }); return fragment; } - private String getNodePath() { - return getValueModel().getJcrPropertymodel().getItemModel().getParentModel().getPath(); - } - - protected abstract JcrPropertyValueModel getValueModel(); - - protected abstract IModel getBaseModel(); - /** * Callback urls aren't known at construction so set them here */ @@ -291,17 +222,6 @@ if (configuration != null && configuration.getEditorStarted()) { configuration.addProperty("callbackUrl", editor.getCallbackUrl()); - //TODO: add enum to distinguish sorts of drops available - if (configuration.getPluginConfiguration("InsertImage") != null) { - configuration.getPluginConfiguration("InsertImage").addProperty("callbackUrl", - imagePickerBehavior.getCallbackUrl().toString()); - } - - if (configuration.getPluginConfiguration("CreateLink") != null) { - configuration.getPluginConfiguration("CreateLink").addProperty("callbackUrl", - linkPickerBehavior.getCallbackUrl().toString()); - } - if (configuration.getPluginConfiguration("CreateExternalLink") != null) { configuration.getPluginConfiguration("CreateExternalLink").addProperty("callbackUrl", externalLinkBehavior.getCallbackUrl().toString()); @@ -312,154 +232,12 @@ @Override protected void onDetach() { - if (imageService != null) { - imageService.detach(); - } - if (linkService != null) { - linkService.detach(); - } if (nodeModel != null) { nodeModel.detach(); } super.onDetach(); } - protected String clean(final String value) throws Exception { - if (value != null) { - IHtmlCleanerService cleaner = getPluginContext().getService(IHtmlCleanerService.class.getName(), - IHtmlCleanerService.class); - if (cleaner != null) { - return cleaner.clean(value); - } - } - return value; - } - - private void removeLinks(String text) { - Set linkNames = XinhaHtmlProcessor.getInternalLinks(text); - linkService.cleanup(linkNames); - } - - private class XinhaModel implements IModel { - private static final long serialVersionUID = 1L; - - private JcrPropertyValueModel valueModel; - - public XinhaModel(JcrPropertyValueModel valueModel) { - this.valueModel = valueModel; - } - - public Object getObject() { - return valueModel.getObject(); - } - - public void setObject(Object value) { - try { - String cleanedValue = clean((String) value); - if (cleanedValue != null) { - removeLinks(cleanedValue); - } - valueModel.setObject(cleanedValue); - } catch (Exception e) { - error(new ResourceModel("error-while-cleaning-conent", "An error occured while cleaning the content")); - log.error("Exception caught during editor creation while cleaning value: " + value, e); - } - } - - public void detach() { - valueModel.detach(); - } - } - - private class XinhaTextArea extends TextArea { - private static final long serialVersionUID = 1L; - - private AbstractAjaxBehavior callback; - - public XinhaTextArea(String id, IModel model) { - super(id, model); - - setOutputMarkupId(true); - setVisible(true); - setMarkupId("xinha" + Integer.valueOf(Session.get().nextSequenceValue())); - - add(callback = new AbstractDefaultAjaxBehavior() { - private static final long serialVersionUID = 1L; - - @Override - public void respond(AjaxRequestTarget target) { - processInput(); - } - }); - } - - public String getCallbackUrl() { - return callback.getCallbackUrl().toString(); - } - - @Override - protected void onComponentTag(final ComponentTag tag) { - StringBuilder sb = new StringBuilder(); - String width = getPluginConfig().getString("width", "1px"); - sb.append("width: "); - sb.append(width); - sb.append(";"); - - String height = getPluginConfig().getString("height", "1px"); - sb.append("height: "); - sb.append(height); - sb.append(";"); - - sb.append("display: none;"); - tag.put("style", sb.toString()); - super.onComponentTag(tag); - } - - } - - class PreviewLinksBehavior extends AbstractDefaultAjaxBehavior implements ILinkDecorator { - private static final long serialVersionUID = 1L; - - private static final String JS_STOP_EVENT = "Wicket.stopEvent(event);"; - - @Override - protected void respond(AjaxRequestTarget target) { - Request request = RequestCycle.get().getRequest(); - String link = request.getParameter("link"); - if (link != null) { - IBrowseService browser = getPluginContext().getService( - getPluginConfig().getString(IBrowseService.BROWSER_ID), IBrowseService.class); - if (browser != null) { - JcrNodeModel model = (JcrNodeModel) getModel(); - Node node = model.getNode(); - try { - if (node.hasNode(link)) { - node = node.getNode(link); - if (node.isNodeType(HippoNodeType.NT_FACETSELECT)) { - String uuid = node.getProperty(HippoNodeType.HIPPO_DOCBASE).getString(); - javax.jcr.Session s = ((UserSession) getSession()).getJcrSession(); - node = s.getNodeByUUID(uuid); - browser.browse(new JcrNodeModel(node)); - } - } - } catch (RepositoryException e) { - e.printStackTrace(); - } - } - } - } - - public String internalLink(String link) { - String url = getCallbackUrl(false) + "&link=" + WicketURLEncoder.QUERY_INSTANCE.encode(link); - return "href=\"#\" onclick=\"" + JS_STOP_EVENT + generateCallbackScript("wicketAjaxGet('" + url + "'") - + "\""; - } - - public String externalLink(String link) { - return "href=\"" + link + "\" onclick=\"" + JS_STOP_EVENT + "\""; - } - } - class EditorManagerBehavior extends AbstractYuiBehavior { private static final long serialVersionUID = 1L; Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/DiffModel.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -16,8 +16,10 @@ package org.hippoecm.frontend.plugins.xinha; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.StringReader; +import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; @@ -30,6 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; +import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; public class DiffModel extends LoadableDetachableModel { @@ -50,15 +53,16 @@ if (original == null || current == null) { return null; } - try { - InputSource oldSource = new InputSource(); - oldSource.setCharacterStream(new StringReader(original.getObject())); + InputSource oldSource = new InputSource(); + oldSource.setCharacterStream(new StringReader(original.getObject())); - InputSource newSource = new InputSource(); - newSource.setCharacterStream(new StringReader(current.getObject())); + InputSource newSource = new InputSource(); + newSource.setCharacterStream(new StringReader(current.getObject())); - SAXTransformerFactory tf = (SAXTransformerFactory) TransformerFactory.newInstance(); - TransformerHandler handler = tf.newTransformerHandler(); + SAXTransformerFactory tf = (SAXTransformerFactory) TransformerFactory.newInstance(); + TransformerHandler handler; + try { + handler = tf.newTransformerHandler(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); StreamResult dr = new StreamResult(baos); handler.setResult(dr); @@ -69,8 +73,12 @@ handler.endDocument(); return baos.toString(); - } catch (Exception e) { + } catch (TransformerConfigurationException e) { log.error(e.getMessage()); + } catch (SAXException e) { + log.error(e.getMessage()); + } catch (IOException e) { + log.error(e.getMessage()); } return null; } Deleted: 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 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/IHtmlCleanerService.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,24 +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; - -import org.apache.wicket.IClusterable; - -public interface IHtmlCleanerService extends IClusterable { - final static String SVN_ID = "$Id$"; - - String clean(String value) throws Exception; -} Added: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/PrefixingModel.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/PrefixingModel.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/PrefixingModel.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,53 @@ +/* + * Copyright 2010 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.model.IModel; +import org.apache.wicket.model.LoadableDetachableModel; +import org.hippoecm.frontend.plugins.richtext.RichTextProcessor; +import org.hippoecm.frontend.plugins.richtext.RichTextProcessor.ILinkDecorator; + +public class PrefixingModel extends LoadableDetachableModel { + private static final long serialVersionUID = 1L; + + private String prefix; + private IModel bare; + private ILinkDecorator linkDecorator; + + public PrefixingModel(IModel bare, ILinkDecorator linkDecorator, String prefix) { + this.bare = bare; + this.linkDecorator = linkDecorator; + this.prefix = prefix; + } + + @Override + protected String load() { + String text = bare.getObject(); + if (text != null) { + String processed = RichTextProcessor.prefixImageLinks(text, prefix); + return RichTextProcessor.decorateLinks(processed, linkDecorator); + } else { + return null; + } + } + + @Override + public void detach() { + bare.detach(); + super.detach(); + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/PrefixingModel.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Id Added: svn:eol-style + native Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaHtmlProcessor.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaHtmlProcessor.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaHtmlProcessor.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,160 +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; - -import java.util.Set; -import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.wicket.protocol.http.WicketURLDecoder; -import org.hippoecm.frontend.plugins.xinha.services.links.ExternalXinhaLink; - -public class XinhaHtmlProcessor { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static Pattern LINK_AND_IMAGES_PATTERN = Pattern.compile("<(a|img)(\\s+)(.*?)(src|href)=\"(.*?)\"(.*?)>", - Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL); - private static Pattern IMG_PATTERN = Pattern.compile("]+>", Pattern.CASE_INSENSITIVE); - private static Pattern SRC_PATTERN = Pattern.compile("src=\"([^\"]+)\"", Pattern.CASE_INSENSITIVE); - private static Pattern FACET_SELECT_PATTERN = Pattern.compile("facetselect=\"([^\"]+)\"", Pattern.CASE_INSENSITIVE); - - private static Pattern LINK_PATTERN = Pattern.compile("]+>", Pattern.CASE_INSENSITIVE); - private static Pattern HREF_PATTERN = Pattern.compile("href=\"[^\"]+\"", Pattern.CASE_INSENSITIVE); - - /** - * Prefix the targets of relative image links in a text. Text and prefix may - * neither be null. - */ - public static String prefixImageLinks(String text, String prefix) { - StringBuffer processed = new StringBuffer(); - Matcher m = IMG_PATTERN.matcher(text); - - while (m.find()) { - String img = m.group(); - StringBuffer newImg = new StringBuffer(); - Matcher s = SRC_PATTERN.matcher(img); - - if (s.find()) { - String src = s.group(); - Matcher fs = FACET_SELECT_PATTERN.matcher(img); - - if (fs.find()) { - String link = fs.group(1); - - if (!link.startsWith("http:") && !link.startsWith("https:")) { - if (XinhaUtil.isPortletContext()) { - s.appendReplacement(newImg, ("src=\"" + prefix + "?_path=" + link + "\"").replace("\\", - "\\\\").replace("$", "\\$")); - } else { - s.appendReplacement(newImg, ("src=\"" + prefix + link + "\"").replace("\\", "\\\\") - .replace("$", "\\$")); - } - } else { - s.appendReplacement(newImg, src.replace("\\", "\\\\").replace("$", "\\$")); - } - } else { - String link = s.group(1); - - if (!link.startsWith("http:") && !link.startsWith("https:")) { - s.appendReplacement(newImg, ("src=\"" + prefix + link + "\"").replace("\\", "\\\\").replace( - "$", "\\$")); - } else { - s.appendReplacement(newImg, src.replace("\\", "\\\\").replace("$", "\\$")); - } - } - } - - s.appendTail(newImg); - m.appendReplacement(processed, newImg.toString().replace("\\", "\\\\").replace("$", "\\$")); - } - - m.appendTail(processed); - - return processed.toString(); - } - - /** - * Return the internal links, i.e. the links to other documents / images / assets - * in the text. The text may not be null. - */ - public static Set getInternalLinks(String text) { - Set links = new TreeSet(); - Matcher m = LINK_AND_IMAGES_PATTERN.matcher(text); - while (m.find()) { - String link = m.group(5); - if (isExternalLink(link)) { - continue; - } - String linkName; - if (link.indexOf('/') > 0) { - linkName = link.substring(0, link.indexOf('/')); - } else { - linkName = link; - } - linkName = WicketURLDecoder.PATH_INSTANCE.decode(linkName); - links.add(linkName); - } - return links; - } - - public static String decorateLinks(String text, ILinkDecorator decorator) { - - StringBuffer processed = new StringBuffer(); - Matcher m = LINK_PATTERN.matcher(text); - while (m.find()) { - String anchor = m.group(); - StringBuffer newAnchor = new StringBuffer(); - Matcher s = HREF_PATTERN.matcher(anchor); - if (s.find()) { - String href = s.group(); - // skip href= - String link = href.substring(5); - - if (link.charAt(0) == '"') { - link = link.substring(1); - } - if (link.charAt(link.length() - 1) == '"') { - link = link.substring(0, link.length() - 1); - } - - link = isExternalLink(link) ? decorator.externalLink(link) : decorator.internalLink(link); - s.appendReplacement(newAnchor, link.replace("\\", "\\\\").replace("$", "\\$")); - } - s.appendTail(newAnchor); - m.appendReplacement(processed, newAnchor.toString().replace("\\", "\\\\").replace("$", "\\$")); - } - m.appendTail(processed); - - return processed.toString(); - } - - private static boolean isExternalLink(String link) { - for (String protocol : ExternalXinhaLink.PROTOCOLS) { - if (link.startsWith(protocol)) { - return true; - } - } - return false; - } - - public static interface ILinkDecorator { - String internalLink(String link); - String externalLink(String link); - } - -} Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaNodePlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaNodePlugin.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaNodePlugin.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -19,13 +19,34 @@ import javax.jcr.Property; import javax.jcr.RepositoryException; +import org.apache.wicket.Request; +import org.apache.wicket.RequestCycle; +import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.IModel; +import org.apache.wicket.protocol.http.WicketURLEncoder; import org.hippoecm.frontend.model.IModelReference; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.model.properties.JcrPropertyModel; import org.hippoecm.frontend.model.properties.JcrPropertyValueModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; +import org.hippoecm.frontend.plugins.richtext.IHtmlCleanerService; +import org.hippoecm.frontend.plugins.richtext.RichTextModel; +import org.hippoecm.frontend.plugins.richtext.RichTextUtil; +import org.hippoecm.frontend.plugins.richtext.RichTextProcessor.ILinkDecorator; +import org.hippoecm.frontend.plugins.richtext.jcr.JcrRichTextImageFactory; +import org.hippoecm.frontend.plugins.richtext.jcr.JcrRichTextLinkFactory; +import org.hippoecm.frontend.plugins.xinha.dialog.images.ImagePickerBehavior; +import org.hippoecm.frontend.plugins.xinha.dialog.links.InternalLinkBehavior; +import org.hippoecm.frontend.plugins.xinha.dragdrop.XinhaDropBehavior; +import org.hippoecm.frontend.plugins.xinha.services.images.XinhaImageService; +import org.hippoecm.frontend.plugins.xinha.services.links.XinhaLinkService; +import org.hippoecm.frontend.service.IBrowseService; +import org.hippoecm.frontend.service.IEditor; +import org.hippoecm.frontend.session.UserSession; +import org.hippoecm.repository.api.HippoNodeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,17 +58,29 @@ static final Logger log = LoggerFactory.getLogger(XinhaNodePlugin.class); + private PreviewLinksBehavior previewLinksBehavior; + private InternalLinkBehavior linkPickerBehavior; + private ImagePickerBehavior imagePickerBehavior; + + private XinhaImageService imageService; + private XinhaLinkService linkService; + public XinhaNodePlugin(IPluginContext context, final IPluginConfig config) { super(context, config); + + String binariesPath = BINARIES_PREFIX + + getValueModel().getJcrPropertymodel().getItemModel().getParentModel().getPath(); + configuration.addProperty("prefix", RichTextUtil.encodeResourceURL(RichTextUtil.encode(binariesPath) + "/")); } + @Override protected JcrPropertyValueModel getValueModel() { JcrNodeModel nodeModel = (JcrNodeModel) getDefaultModel(); return getContentModel(nodeModel); } @Override - protected IModel getBaseModel() { + protected JcrPropertyValueModel getBaseModel() { IPluginConfig config = getPluginConfig(); if (!config.containsKey("model.compareTo")) { return null; @@ -60,6 +93,106 @@ return getContentModel((JcrNodeModel) modelRef.getModel()); } + @Override + protected IModel newCompareModel() { + return new PrefixingModel(super.newCompareModel(), previewLinksBehavior, configuration.getProperty("prefix")); + } + + @Override + protected IModel newViewModel() { + return new PrefixingModel(getValueModel(), previewLinksBehavior, configuration.getProperty("prefix")); + } + + @Override + protected RichTextModel newEditModel() { + RichTextModel model = super.newEditModel(); + model.setCleaner(getPluginContext().getService(IHtmlCleanerService.class.getName(), IHtmlCleanerService.class)); + JcrNodeModel nodeModel = new JcrNodeModel(getValueModel().getJcrPropertymodel().getItemModel().getParentModel()); + model.setLinkFactory(new JcrRichTextLinkFactory(nodeModel)); + return model; + } + + @Override + protected Fragment createPreview(String fragmentId) { + if (previewLinksBehavior == null) { + add(previewLinksBehavior = new PreviewLinksBehavior()); + } + + return super.createPreview(fragmentId); + } + + @Override + protected Fragment createEditor(String fragmentid) { + Fragment fragment = super.createEditor(fragmentid); + + JcrNodeModel nodeModel = new JcrNodeModel(getValueModel().getJcrPropertymodel().getItemModel().getParentModel()); + imageService = new XinhaImageService(new JcrRichTextImageFactory(nodeModel)) { + private static final long serialVersionUID = 1L; + + @Override + protected String getXinhaName() { + return configuration.getName(); + } + + }; + + linkService = new XinhaLinkService(new JcrRichTextLinkFactory(nodeModel)) { + private static final long serialVersionUID = 1L; + + @Override + protected String getXinhaName() { + return configuration.getName(); + } + + }; + + IPluginContext context = getPluginContext(); + IPluginConfig config = getPluginConfig(); + editor.add(imagePickerBehavior = new ImagePickerBehavior(context, config + .getPluginConfig("Xinha.plugins.InsertImage"), imageService)); + editor.add(linkPickerBehavior = new InternalLinkBehavior(context, config + .getPluginConfig("Xinha.plugins.CreateLink"), linkService)); + + if (previewLinksBehavior != null) { + remove(previewLinksBehavior); + previewLinksBehavior = null; + } + + add(new XinhaDropBehavior(context, config) { + private static final long serialVersionUID = 1L; + + @Override + protected void insertImage(JcrNodeModel model, AjaxRequestTarget target) { + String returnScript = imageService.attach(model); + if (returnScript != null) { + target.getHeaderResponse().renderOnDomReadyJavascript(returnScript); + } + } + + @Override + protected void updateImage(JcrNodeModel model, AjaxRequestTarget target) { + //TODO: check if old image facet select should be deleted + insertImage(model, target); + } + + @Override + protected void insertLink(JcrNodeModel model, AjaxRequestTarget target) { + String returnScript = linkService.attach(model); + if (returnScript != null) { + target.getHeaderResponse().renderOnDomReadyJavascript(returnScript); + } + } + + @Override + protected void updateLink(JcrNodeModel model, AjaxRequestTarget target) { + //TODO: check if old link facet select should be deleted + insertLink(model, target); + } + }); + + return fragment; + } + private JcrPropertyValueModel getContentModel(JcrNodeModel nodeModel) { try { Node node = nodeModel.getNode(); @@ -74,4 +207,76 @@ return null; } + @Override + public void onBeforeRender() { + if (configuration != null && configuration.getEditorStarted()) { + //TODO: add enum to distinguish sorts of drops available + if (configuration.getPluginConfiguration("InsertImage") != null) { + configuration.getPluginConfiguration("InsertImage").addProperty("callbackUrl", + imagePickerBehavior.getCallbackUrl().toString()); + } + + if (configuration.getPluginConfiguration("CreateLink") != null) { + configuration.getPluginConfiguration("CreateLink").addProperty("callbackUrl", + linkPickerBehavior.getCallbackUrl().toString()); + } + } + // TODO Auto-generated method stub + super.onBeforeRender(); + } + + @Override + protected void onDetach() { + if (imageService != null) { + imageService.detach(); + } + if (linkService != null) { + linkService.detach(); + } + super.onDetach(); + } + + class PreviewLinksBehavior extends AbstractDefaultAjaxBehavior implements ILinkDecorator { + private static final long serialVersionUID = 1L; + + private static final String JS_STOP_EVENT = "Wicket.stopEvent(event);"; + + @Override + protected void respond(AjaxRequestTarget target) { + Request request = RequestCycle.get().getRequest(); + String link = request.getParameter("link"); + if (link != null) { + IBrowseService browser = getPluginContext().getService( + getPluginConfig().getString(IBrowseService.BROWSER_ID), IBrowseService.class); + if (browser != null) { + JcrNodeModel model = (JcrNodeModel) getModel(); + Node node = model.getNode(); + try { + if (node.hasNode(link)) { + node = node.getNode(link); + if (node.isNodeType(HippoNodeType.NT_FACETSELECT)) { + String uuid = node.getProperty(HippoNodeType.HIPPO_DOCBASE).getString(); + javax.jcr.Session s = ((UserSession) getSession()).getJcrSession(); + node = s.getNodeByUUID(uuid); + browser.browse(new JcrNodeModel(node)); + } + } + } catch (RepositoryException e) { + e.printStackTrace(); + } + } + } + } + + public String internalLink(String link) { + String url = getCallbackUrl(false) + "&link=" + WicketURLEncoder.QUERY_INSTANCE.encode(link); + return "href=\"#\" onclick=\"" + JS_STOP_EVENT + generateCallbackScript("wicketAjaxGet('" + url + "'") + + "\""; + } + + public String externalLink(String link) { + return "href=\"" + link + "\" onclick=\"" + JS_STOP_EVENT + "\""; + } + } + } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaPlugin.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -39,7 +39,7 @@ return (JcrPropertyValueModel) getDefaultModel(); } - protected IModel getBaseModel() { + protected JcrPropertyValueModel getBaseModel() { IPluginConfig config = getPluginConfig(); if (!config.containsKey("model.compareTo")) { return null; @@ -49,7 +49,7 @@ if (modelRef == null) { return null; } - return modelRef.getModel(); + return (JcrPropertyValueModel) modelRef.getModel(); } } Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaUtil.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaUtil.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/XinhaUtil.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,66 +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; - -import org.apache.commons.lang.StringUtils; -import org.apache.wicket.RequestContext; -import org.apache.wicket.protocol.http.WicketURLDecoder; -import org.apache.wicket.protocol.http.WicketURLEncoder; -import org.apache.wicket.protocol.http.portlet.PortletRequestContext; - -public class XinhaUtil { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - public static final String encode(String path) { - String[] elements = StringUtils.split(path, '/'); - for (int i = 0; i < elements.length; i++) { - elements[i] = WicketURLEncoder.PATH_INSTANCE.encode(elements[i], "UTF-8"); - } - return StringUtils.join(elements, '/'); - } - - public static final String decode(String path) { - String[] elements = StringUtils.split(path, '/'); - for (int i = 0; i < elements.length; i++) { - elements[i] = WicketURLDecoder.PATH_INSTANCE.decode(elements[i], "UTF-8"); - } - return StringUtils.join(elements, '/'); - } - - public static final String encodeResourceURL(String url) { - return encodeResourceURL(url, true); - } - - public static final String encodeResourceURL(String url, boolean useRelativeURL) { - // if it is in portlet environment, just wrap the url in portlet resource url. - RequestContext requestContext = RequestContext.get(); - if (requestContext.isPortletRequest()) { - url = ((PortletRequestContext) requestContext).encodeResourceURL(url).toString(); - if (useRelativeURL && (url.startsWith("http:") || url.startsWith("https:"))) { - int offset = url.indexOf('/', 8); - if (offset != -1) { - url = url.substring(offset); - } - } - } - return url; - } - - public static final boolean isPortletContext() { - return RequestContext.get().isPortletRequest(); - } -} Modified: 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/dialog/AbstractBrowserDialog.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractBrowserDialog.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -36,6 +36,7 @@ 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.model.DocumentLink; import org.hippoecm.frontend.service.IRenderService; import org.hippoecm.frontend.service.preferences.IPreferencesStore; import org.hippoecm.repository.HippoStdNodeType; @@ -84,7 +85,7 @@ //save modelServiceId and dialogServiceId in cluster config String modelServiceId = decorated.getString("wicket.model"); - IModel model = getModelObject().getNodeModel(); + IModel model = (IModel) getModelObject().getLinkTarget(); if (model == null) { IPreferencesStore store = context.getService(IPreferencesStore.SERVICE_ID, IPreferencesStore.class); @@ -104,7 +105,7 @@ } else { IModel newModel = modelReference.getModel(); if (newModel != null) { - getModelObject().setNodeModel((JcrNodeModel) newModel); + getModelObject().setLinkTarget((JcrNodeModel) newModel); checkState(); } } @@ -118,9 +119,9 @@ public void onEvent(Iterator events) { IModel newModel = modelReference.getModel(); if (newModel != null) { - JcrNodeModel currentModel = getModelObject().getNodeModel(); + JcrNodeModel currentModel = (JcrNodeModel) getModelObject().getLinkTarget(); if (!newModel.equals(currentModel)) { - getModelObject().setNodeModel((JcrNodeModel) newModel); + getModelObject().setLinkTarget((JcrNodeModel) newModel); checkState(); } } Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractPersistedMap.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractPersistedMap.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractPersistedMap.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,73 +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; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -public abstract class AbstractPersistedMap extends HashMap implements IPersistedMap { - private static final long serialVersionUID = 1L; - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private Map initialValues; - - public AbstractPersistedMap(Map values) { - if (values != null) { - putAll(values); - } - initialValues = values; - } - - public boolean isValid() { - return true; - } - - public boolean hasChanged() { - return !equals(initialValues); - } - - public boolean isExisting() { - return initialValues != null; - } - - public String toJsString() { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - boolean first = true; - for (Entry e : (Set>) entrySet()) { - if (first) { - first = false; - } else { - sb.append(','); - } - sb.append(e.getKey()).append(':').append(serializeValue(e.getValue())); - } - sb.append('}'); - return sb.toString(); - } - - protected Object serializeValue(Object value) { - return JavascriptUtil.serialize2JS((String) value); - } - - protected Map getInitialValues() { - return initialValues; - } - -} Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractXinhaDialog.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractXinhaDialog.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractXinhaDialog.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -24,8 +24,9 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; import org.hippoecm.frontend.dialog.AbstractDialog; +import org.hippoecm.frontend.plugins.xinha.model.IPersisted; -public abstract class AbstractXinhaDialog extends AbstractDialog { +public abstract class AbstractXinhaDialog extends AbstractDialog { private static final long serialVersionUID = 1L; @SuppressWarnings("unused") Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/DocumentLink.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/DocumentLink.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/DocumentLink.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,99 +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; - -import java.util.Map; - -import javax.jcr.Node; -import javax.jcr.RepositoryException; - -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugins.xinha.services.links.XinhaLink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public abstract class DocumentLink extends XinhaLink { - private static final long serialVersionUID = 1L; - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - protected static final Logger log = LoggerFactory.getLogger(DocumentLink.class); - - private JcrNodeModel initialModel; - private JcrNodeModel selectedModel; - - public DocumentLink(Map values, JcrNodeModel parentModel) { - super(values); - - initialModel = selectedModel = createInitialModel(parentModel); - } - - protected abstract JcrNodeModel createInitialModel(JcrNodeModel parentModel); - - @Override - public boolean isValid() { - if (selectedModel == null) { - return false; - } - Node node = selectedModel.getObject(); - if (node == null) { - return false; - } - try { - if (!node.isNodeType("mix:referenceable")) { - return false; - } - } catch (RepositoryException e) { - log.error(e.getMessage()); - return false; - } - return true; - } - - @Override - public boolean hasChanged() { - if (selectedModel.equals(initialModel)) { - return super.hasChanged(); - } - return true; - } - - @Override - public boolean isExisting() { - return initialModel != null; - } - - public boolean isReplacing() { - if (selectedModel != null && initialModel != null && !selectedModel.equals(initialModel)) { - return true; - } - return false; - } - - public boolean isAttacheable() { - return initialModel == null || isReplacing(); - } - - public JcrNodeModel getNodeModel() { - return selectedModel; - } - - public void setNodeModel(JcrNodeModel model) { - this.selectedModel = model; - } -} Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/IPersistedMap.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/IPersistedMap.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/IPersistedMap.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,37 +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; - -import java.util.Map; - -import org.apache.wicket.IClusterable; - -public interface IPersistedMap extends Map, IClusterable { - final static String SVN_ID = "$Id$"; - - boolean isValid(); - - boolean hasChanged(); - - boolean isExisting(); - - void save(); - - void delete(); - - String toJsString(); - -} 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 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/links/DocumentBrowserDialog.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -22,7 +22,7 @@ import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.plugins.xinha.dialog.AbstractBrowserDialog; -import org.hippoecm.frontend.plugins.xinha.dialog.DocumentLink; +import org.hippoecm.frontend.plugins.xinha.model.DocumentLink; import org.hippoecm.frontend.widgets.BooleanFieldWidget; import org.hippoecm.frontend.widgets.TextFieldWidget; import org.slf4j.Logger; Modified: 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 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/htmlcleaner/HtmlCleanerPlugin.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -21,7 +21,7 @@ import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.Plugin; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.frontend.plugins.xinha.IHtmlCleanerService; +import org.hippoecm.frontend.plugins.richtext.IHtmlCleanerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/editormanager-debug.js =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/editormanager-debug.js 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/js/editormanager/editormanager-debug.js 2010-03-22 20:08:15 UTC (rev 22205) @@ -375,7 +375,7 @@ if(!Lang.isUndefined(this.config.formatBlock)) { xinhaConfig.formatblock = this.config.formatBlock; } - + //make editors var textarea = this.config.textarea; var xinha = Xinha.makeEditors([textarea], xinhaConfig, this.config.plugins)[textarea]; Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/AbstractPersistedMap.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/AbstractPersistedMap.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/AbstractPersistedMap.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/AbstractPersistedMap.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,74 @@ +/* + * 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.model; + +import java.util.HashMap; +import java.util.Map; + +import org.hippoecm.frontend.plugins.xinha.dialog.JavascriptUtil; + +public abstract class AbstractPersistedMap extends HashMap implements IPersisted { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + private Map initialValues; + + public AbstractPersistedMap(Map values) { + if (values != null) { + putAll(values); + } + initialValues = values; + } + + public boolean isValid() { + return true; + } + + public boolean hasChanged() { + return !equals(initialValues); + } + + public boolean isExisting() { + return initialValues != null; + } + + public String toJsString() { + StringBuilder sb = new StringBuilder(); + sb.append('{'); + boolean first = true; + for (Map.Entry e : entrySet()) { + if (first) { + first = false; + } else { + sb.append(','); + } + sb.append(e.getKey()).append(':').append(serializeValue(e.getValue())); + } + sb.append('}'); + return sb.toString(); + } + + protected Object serializeValue(Object value) { + return JavascriptUtil.serialize2JS((String) value); + } + + protected Map getInitialValues() { + return initialValues; + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/AbstractPersistedMap.java ___________________________________________________________________ Added: svn:keywords + Id Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/DocumentLink.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/DocumentLink.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/DocumentLink.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/DocumentLink.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,75 @@ +/* + * 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.model; + +import java.util.Map; + +import org.apache.wicket.model.IDetachable; +import org.hippoecm.frontend.plugins.xinha.services.links.XinhaLink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class DocumentLink extends XinhaLink { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + protected static final Logger log = LoggerFactory.getLogger(DocumentLink.class); + + private IDetachable initialModel; + private IDetachable selectedModel; + + public DocumentLink(Map values, IDetachable model) { + super(values); + + initialModel = selectedModel = model; + } + + @Override + public boolean hasChanged() { + if (selectedModel.equals(initialModel)) { + return super.hasChanged(); + } + return true; + } + + @Override + public boolean isExisting() { + return initialModel != null; + } + + public boolean isReplacing() { + if (selectedModel != null && initialModel != null && !selectedModel.equals(initialModel)) { + return true; + } + return false; + } + + public boolean isAttacheable() { + return initialModel == null || isReplacing(); + } + + public IDetachable getLinkTarget() { + return selectedModel; + } + + public void setLinkTarget(IDetachable model) { + this.selectedModel = model; + } + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/DocumentLink.java ___________________________________________________________________ Added: svn:keywords + Id Copied: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/IPersisted.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/dialog/IPersistedMap.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/IPersisted.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/IPersisted.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,35 @@ +/* + * 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.model; + +import org.apache.wicket.IClusterable; + +public interface IPersisted extends IClusterable { + final static String SVN_ID = "$Id$"; + + boolean isValid(); + + boolean hasChanged(); + + boolean isExisting(); + + void save(); + + void delete(); + + String toJsString(); + +} Property changes on: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/model/IPersisted.java ___________________________________________________________________ Added: svn:keywords + Id Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/XinhaFacetHelper.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/XinhaFacetHelper.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/XinhaFacetHelper.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,88 +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.services; - -import javax.jcr.ItemExistsException; -import javax.jcr.Node; -import javax.jcr.PathNotFoundException; -import javax.jcr.RepositoryException; -import javax.jcr.lock.LockException; -import javax.jcr.nodetype.ConstraintViolationException; -import javax.jcr.nodetype.NoSuchNodeTypeException; -import javax.jcr.version.VersionException; - -import org.hippoecm.repository.api.HippoNodeType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class XinhaFacetHelper { - - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - static final Logger log = LoggerFactory.getLogger(XinhaFacetHelper.class); - - public String createFacet(Node node, String link, String uuid) throws ItemExistsException, PathNotFoundException, - NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException { - if (uuid == null) { - log.error("uuid is null. Should never be possible for facet"); - return ""; - } - - String linkName = newLinkName(node, link); - - Node facetselect = node.addNode(linkName, HippoNodeType.NT_FACETSELECT); - facetselect.setProperty(HippoNodeType.HIPPO_DOCBASE, uuid); - facetselect.setProperty(HippoNodeType.HIPPO_FACETS, new String[] {}); - facetselect.setProperty(HippoNodeType.HIPPO_MODES, new String[] {}); - facetselect.setProperty(HippoNodeType.HIPPO_VALUES, new String[] {}); - - // save the document (the draft so no problem) - Node document = node.getParent(); - while (document.getDepth() > 0) { - if (document.isNodeType(HippoNodeType.NT_DOCUMENT)) { - if (document.isNew()) { - log.warn("Document is new, saving session"); - document.getSession().save(); - document.getSession().refresh(false); - } else { - document.save(); - document.refresh(false); - } - break; - } - document = document.getParent(); - } - - return linkName; - } - - private String newLinkName(Node node, String link) throws RepositoryException { - if (!node.hasNode(link)) { - return link; - } - int postfix = 1; - while (true) { - String testLink = link + "_" + postfix; - if (!node.hasNode(testLink)) { - return testLink; - } - postfix++; - } - } - -} Deleted: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/ImageItemFactory.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/ImageItemFactory.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/ImageItemFactory.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -1,211 +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.services.images; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.jcr.AccessDeniedException; -import javax.jcr.ItemNotFoundException; -import javax.jcr.Node; -import javax.jcr.PathNotFoundException; -import javax.jcr.RepositoryException; -import javax.jcr.UnsupportedRepositoryOperationException; -import javax.jcr.nodetype.NodeDefinition; -import javax.jcr.nodetype.NodeType; - -import org.apache.wicket.IClusterable; -import org.apache.wicket.Session; -import org.apache.wicket.util.string.Strings; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugins.xinha.XinhaUtil; -import org.hippoecm.frontend.session.UserSession; -import org.hippoecm.repository.api.HippoNode; -import org.hippoecm.repository.api.HippoNodeType; -import org.hippoecm.repository.api.HippoWorkspace; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ImageItemFactory implements IClusterable { - @SuppressWarnings("unused") - private final static String SVN_ID = "$Id$"; - - private static final long serialVersionUID = 1L; - - private final static Logger log = LoggerFactory.getLogger(ImageItemFactory.class); - - final static String BINARIES_PREFIX = "binaries"; - - private JcrNodeModel nodeModel; - - public ImageItemFactory(JcrNodeModel nodeModel) { - this.nodeModel = nodeModel; - } - - //TODO: Logic here is same as XinhaImage.createInitialModel, should only be here in factory. Remove from XinhaImage. - public ImageItem createImageItem(Map values) { - //TODO: handle facetselect value - String url = values.get(XinhaImage.URL); - if (url != null) { - url = XinhaUtil.decode(url); - if (url.startsWith(BINARIES_PREFIX)) { - - // find the nodename of the facetselect - url = XinhaUtil.decode(url.substring(BINARIES_PREFIX.length())); - if(!Strings.isEmpty(url)) { - try { - javax.jcr.Session session = ((UserSession) Session.get()).getJcrSession(); - HippoWorkspace workspace = (HippoWorkspace) session.getWorkspace(); - Node root = session.getRootNode(); - Node node = ((HippoNode) workspace.getHierarchyResolver().getNode(root, url)).getCanonicalNode(); - if(node != null) { - while(!node.equals(root) && !node.isNodeType(HippoNodeType.NT_HANDLE)) { - node = node.getParent(); - } - return createImageItem(node); - } - } catch (PathNotFoundException e) { - log.error("Error retrieving canonical node for imageNode[" + url + "]", e); - } catch (RepositoryException e) { - log.error("Error retrieving canonical node for imageNode[" + url + "]", e); - } - } - } - } - return null; - } - - public ImageItem createImageItem(Node node) throws UnsupportedRepositoryOperationException, ItemNotFoundException, - AccessDeniedException, RepositoryException { - - NodeType nodetype = node.getPrimaryNodeType(); - if (nodetype.getName().equals("hippo:handle")) { - node = node.getNode(node.getName()); - } - - List resourceDefinitions = new ArrayList(); - for (NodeDefinition nd : node.getPrimaryNodeType().getChildNodeDefinitions()) { - if (!nd.getName().equals(node.getPrimaryItem().getName()) && nd.getDefaultPrimaryType() != null - && nd.getDefaultPrimaryType().isNodeType("hippo:resource")) { - resourceDefinitions.add(nd.getName()); - } - } - return new ImageItem(node.getPath(), node.getParent().getUUID(), node.getPrimaryItem().getName(), node - .getName(), resourceDefinitions, nodeModel.getNode().getPath()); - } - - public static class ImageItem implements IClusterable { - private static final long serialVersionUID = 1L; - - private String parentPath; - private String path; - private String uuid; - private String nodeName; - private String facetName; - private String primaryItemName; - private List resourceDefinitions; - private String selectedResourceDefinition; - - public ImageItem(String path, String uuid, String primaryItemName, String nodeName, - List resourceDefinitions, String nodePath) { - this.path = path; - this.uuid = uuid; - this.primaryItemName = primaryItemName; - this.facetName = nodeName; - this.nodeName = nodeName; - this.parentPath = nodePath; - this.resourceDefinitions = resourceDefinitions != null ? resourceDefinitions : new ArrayList(); - if (this.resourceDefinitions.size() == 1) { - selectedResourceDefinition = this.resourceDefinitions.get(0); - } - } - - public String getUuid() { - return uuid; - } - - public String getPrimaryUrl() { - return XinhaUtil.encode("binaries" + path + "/" + primaryItemName); - } - - public List getResourceDefinitions() { - return resourceDefinitions; - } - - public String getNodeName() { - return nodeName; - } - - public String getSelectedResourceDefinition() { - return selectedResourceDefinition; - } - - public void setSelectedResourceDefinition(String selectedResourceDefinition) { - this.selectedResourceDefinition = selectedResourceDefinition; - } - - public void setFacetName(String facet) { - this.facetName = facet; - } - - public String getFacetName() { - return facetName; - } - - public String getFacetSelectPath() { - if (selectedResourceDefinition != null) { - return facetName + "/{_document}/" + selectedResourceDefinition; - } else { - return facetName; - } - } - - public String getUrl() { - String url = null; - String parentUrl = "binaries" + parentPath + "/"; - - if (!XinhaUtil.isPortletContext()) { - if (selectedResourceDefinition != null) { - url = XinhaUtil.encode(parentUrl + facetName + "/{_document}/" + selectedResourceDefinition); - } else { - url = XinhaUtil.encode(parentUrl + facetName); - } - } else { - parentUrl = XinhaUtil.encodeResourceURL(XinhaUtil.encode(parentUrl)); - url = - new StringBuilder(80).append(parentUrl) - .append(parentUrl.indexOf('?') == -1 ? '?' : '&') - .append("_path=") - .append(getFacetSelectPath()) - .toString(); - } - - return url; - } - - public boolean isValid() { - return path != null && uuid != null - && !(resourceDefinitions.size() > 1 && selectedResourceDefinition == null); - } - - public JcrNodeModel getNodeModel() { - return new JcrNodeModel(path); - } - - } -} Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImage.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImage.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImage.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -17,19 +17,8 @@ import java.util.Map; -import javax.jcr.Node; -import javax.jcr.PathNotFoundException; -import javax.jcr.RepositoryException; - -import org.apache.wicket.Session; -import org.apache.wicket.util.string.Strings; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugins.xinha.XinhaUtil; -import org.hippoecm.frontend.plugins.xinha.dialog.DocumentLink; -import org.hippoecm.frontend.session.UserSession; -import org.hippoecm.repository.api.HippoNode; -import org.hippoecm.repository.api.HippoNodeType; -import org.hippoecm.repository.api.HippoWorkspace; +import org.apache.wicket.model.IDetachable; +import org.hippoecm.frontend.plugins.xinha.model.DocumentLink; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,9 +26,9 @@ private static final long serialVersionUID = 1L; final static String SVN_ID = "$Id$"; - + static final Logger log = LoggerFactory.getLogger(XinhaImage.class); - + final static String BINARIES_PREFIX = "binaries"; public static final String BASE = "f_base"; @@ -53,7 +42,7 @@ public static final String WIDTH = "f_width"; public static final String HEIGHT = "f_height"; - public XinhaImage(Map values, JcrNodeModel parentModel) { + public XinhaImage(Map values, IDetachable parentModel) { super(values, parentModel); } @@ -62,51 +51,14 @@ } public String getUrl() { - return (String) get(URL); + return get(URL); } - + public void setFacetSelectPath(String facetSelectPath) { put(FACET_SELECT, facetSelectPath); } - + public String getFacetSelectPath() { - return (String) get(FACET_SELECT); + return get(FACET_SELECT); } - - @Override - protected JcrNodeModel createInitialModel(JcrNodeModel parentModel) { - String path = getInitialNodePath(parentModel); - if(!Strings.isEmpty(path)) { - try { - javax.jcr.Session session = ((UserSession) Session.get()).getJcrSession(); - HippoWorkspace workspace = (HippoWorkspace) session.getWorkspace(); - Node root = session.getRootNode(); - Node node = ((HippoNode) workspace.getHierarchyResolver().getNode(root, path)).getCanonicalNode(); - if(node != null) { - while(!node.equals(root) && !node.isNodeType(HippoNodeType.NT_HANDLE)) { - node = node.getParent(); - } - return new JcrNodeModel(node); - } - } catch (PathNotFoundException e) { - log.error("Error retrieving canonical node for imageNode[" + path + "]", e); - } catch (RepositoryException e) { - log.error("Error retrieving canonical node for imageNode[" + path + "]", e); - } - } - return null; - } - - protected String getInitialNodePath(JcrNodeModel parentModel) { - String path = getFacetSelectPath(); - if (!Strings.isEmpty(path)) { - path = XinhaUtil.decode(parentModel.getItemModel().getPath() + "/" + path); - } else { - path = getUrl(); - if (!Strings.isEmpty(path) && path.startsWith(BINARIES_PREFIX)) { - path = XinhaUtil.decode(path.substring(BINARIES_PREFIX.length())); - } - } - return path; - } } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImageService.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImageService.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/images/XinhaImageService.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -13,21 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hippoecm.frontend.plugins.xinha.services.images; import java.util.Map; -import javax.jcr.AccessDeniedException; -import javax.jcr.ItemNotFoundException; -import javax.jcr.Node; -import javax.jcr.RepositoryException; -import javax.jcr.UnsupportedRepositoryOperationException; - import org.apache.wicket.model.IDetachable; +import org.apache.wicket.util.string.Strings; import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugins.xinha.services.XinhaFacetHelper; -import org.hippoecm.frontend.plugins.xinha.services.images.ImageItemFactory.ImageItem; +import org.hippoecm.frontend.plugins.richtext.IRichTextImageFactory; +import org.hippoecm.frontend.plugins.richtext.RichTextImage; +import org.hippoecm.frontend.plugins.richtext.RichTextUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,19 +34,19 @@ static final Logger log = LoggerFactory.getLogger(XinhaImageService.class); - private ImageItemFactory factory; - private JcrNodeModel nodeModel; + final static String BINARIES_PREFIX = "binaries"; - public XinhaImageService(JcrNodeModel nodeModel) { - this.nodeModel = nodeModel; - factory = new ImageItemFactory(nodeModel); + private IRichTextImageFactory factory; + + public XinhaImageService(IRichTextImageFactory factory) { + this.factory = factory; } //Attach an image with only a JcrNodeModel. Method return json object wich public String attach(JcrNodeModel model) { //TODO: fix drag-drop replacing - ImageItem item = createImageItem(model); - if (attachImageItem(item)) { + RichTextImage item = createImageItem(model); + if (item.save()) { StringBuilder sb = new StringBuilder(80); sb.append("xinha_editors.").append(getXinhaName()).append(".plugins.InsertImage.instance.insertImage("); sb.append("{ "); @@ -66,19 +61,25 @@ protected abstract String getXinhaName(); public XinhaImage createXinhaImage(Map p) { - return new XinhaImage(p, nodeModel) { + RichTextImage rti = loadImageItem(p); + return new XinhaImage(p, rti != null ? rti.getNodeModel() : null) { private static final long serialVersionUID = 1L; + @Override + public boolean isValid() { + return super.isValid() && factory.isValid(getLinkTarget()); + } + public void save() { if (isAttacheable()) { if (isReplacing()) { - ImageItem remove = createImageItem(getInitialValues()); + RichTextImage remove = loadImageItem(getInitialValues()); if (remove != null) { - detachImageItem(remove); + remove.delete(); } } - ImageItem item = createImageItem(getNodeModel()); - if (attachImageItem(item)) { + RichTextImage item = createImageItem(getLinkTarget()); + if (item.save()) { setFacetSelectPath(item.getFacetSelectPath()); setUrl(item.getUrl()); } @@ -86,8 +87,8 @@ } public void delete() { - ImageItem item = createImageItem(this); - detachImageItem(item); + RichTextImage item = loadImageItem(this); + item.delete(); setFacetSelectPath(""); setUrl(""); } @@ -96,56 +97,24 @@ } public void detach() { - nodeModel.detach(); + factory.detach(); } - private ImageItem createImageItem(Map values) { - return factory.createImageItem(values); - } - - private ImageItem createImageItem(JcrNodeModel nodeModel) { - try { - return factory.createImageItem(nodeModel.getNode()); - } catch (UnsupportedRepositoryOperationException e) { - log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); - } catch (ItemNotFoundException e) { - log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); - } catch (AccessDeniedException e) { - log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); - } catch (RepositoryException e) { - log.error("Error creating ImageItem for model[" + nodeModel.getItemModel().getPath() + "]", e); - } - return null; - } - - private boolean attachImageItem(ImageItem item) { - XinhaFacetHelper helper = new XinhaFacetHelper(); - Node node = nodeModel.getNode(); - try { - String facet = helper.createFacet(node, item.getNodeName(), item.getUuid()); - if (facet != null && !facet.equals("")) { - item.setFacetName(facet); - return true; + private RichTextImage loadImageItem(Map values) { + String path = values.get(XinhaImage.FACET_SELECT); + if (!Strings.isEmpty(path)) { + path = RichTextUtil.decode(path); + } else { + path = values.get(XinhaImage.URL); + if (!Strings.isEmpty(path) && path.startsWith(BINARIES_PREFIX)) { + path = RichTextUtil.decode(path.substring(BINARIES_PREFIX.length())); } - } catch (RepositoryException e) { - log.error("Failed to create facet for " + item.getNodeName(), e); } - return false; + + return factory.loadImageItem(path); } - private void detachImageItem(ImageItem item) { - if (item.getUuid() != null) { - Node node = nodeModel.getNode(); - String facet = item.getFacetName(); - try { - if (node.hasNode(facet)) { - Node imgNode = node.getNode(facet); - imgNode.remove(); - node.getSession().save(); - } - } catch (RepositoryException e) { - log.error("An error occured while trying to save new image facetSelect[" + item.getNodeName() + "]", e); - } - } + private RichTextImage createImageItem(IDetachable nodeModel) { + return factory.createImageItem(nodeModel); } } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/InternalXinhaLink.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/InternalXinhaLink.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/InternalXinhaLink.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -18,52 +18,16 @@ import java.util.Map; -import javax.jcr.Item; -import javax.jcr.Node; -import javax.jcr.PathNotFoundException; -import javax.jcr.RepositoryException; +import org.apache.wicket.model.IDetachable; +import org.hippoecm.frontend.plugins.xinha.model.DocumentLink; -import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugins.xinha.XinhaUtil; -import org.hippoecm.frontend.plugins.xinha.dialog.DocumentLink; -import org.hippoecm.repository.api.HippoNodeType; - public abstract class InternalXinhaLink extends DocumentLink { private static final long serialVersionUID = 1L; @SuppressWarnings("unused") private final static String SVN_ID = "$Id$"; - public InternalXinhaLink(Map values, JcrNodeModel parentModel) { + public InternalXinhaLink(Map values, IDetachable parentModel) { super(values, parentModel); } - - @Override - protected JcrNodeModel createInitialModel(JcrNodeModel parentModel) { - if (parentModel == null) { - return null; - } - String relPath = getHref(); - if (relPath != null && !"".equals(relPath)) { - relPath = XinhaUtil.decode(relPath); - try { - Node node = parentModel.getNode(); - if (node.hasNode(relPath)) { - Node linkNode = node.getNode(relPath); - if (linkNode.isNodeType(HippoNodeType.NT_FACETSELECT)) { - String uuid = linkNode.getProperty(HippoNodeType.HIPPO_DOCBASE).getValue().getString(); - Item item = node.getSession().getNodeByUUID(uuid); - if (item != null) { - return new JcrNodeModel(item.getPath()); - } - } - } - } catch (PathNotFoundException e) { - log.error("Error finding facet node for relative path " + relPath, e); - } catch (RepositoryException e) { - log.error("Error finding facet node for relative path " + relPath, e); - } - } - return null; - } } Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLink.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLink.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLink.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -17,7 +17,7 @@ import java.util.Map; -import org.hippoecm.frontend.plugins.xinha.dialog.AbstractPersistedMap; +import org.hippoecm.frontend.plugins.xinha.model.AbstractPersistedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLinkService.java =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLinkService.java 2010-03-22 12:27:53 UTC (rev 22204) +++ hippo-ecm/trunk/addon/xinha-frontend/src/main/java/org/hippoecm/frontend/plugins/xinha/services/links/XinhaLinkService.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -17,19 +17,12 @@ package org.hippoecm.frontend.plugins.xinha.services.links; import java.util.Map; -import java.util.Set; -import javax.jcr.Node; -import javax.jcr.NodeIterator; -import javax.jcr.RepositoryException; - -import org.apache.wicket.IClusterable; import org.apache.wicket.model.IDetachable; import org.hippoecm.frontend.model.JcrNodeModel; -import org.hippoecm.frontend.plugins.xinha.XinhaUtil; -import org.hippoecm.frontend.plugins.xinha.services.XinhaFacetHelper; -import org.hippoecm.repository.api.HippoNodeType; -import org.hippoecm.repository.api.NodeNameCodec; +import org.hippoecm.frontend.plugins.richtext.IRichTextLinkFactory; +import org.hippoecm.frontend.plugins.richtext.RichTextLink; +import org.hippoecm.frontend.plugins.richtext.RichTextUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,19 +34,22 @@ static final Logger log = LoggerFactory.getLogger(XinhaLinkService.class); - private JcrNodeModel nodeModel; - - public XinhaLinkService(JcrNodeModel nodeModel) { - this.nodeModel = nodeModel; + IRichTextLinkFactory factory; + + public XinhaLinkService(IRichTextLinkFactory factory) { + this.factory = factory; } public InternalXinhaLink create(Map p) { - return new InternalLink(p, nodeModel); + String relPath = p.get(XinhaLink.HREF); + RichTextLink rtl = factory.loadLink(RichTextUtil.decode(relPath)); + return new InternalLink(p, rtl != null ? rtl.getTargetId() : null); } public String attach(JcrNodeModel model) { - String href = createLink(model); - if (href != null) { + RichTextLink rtl = factory.createLink(model); + if (rtl != null && rtl.save()) { + String href = RichTextUtil.encode(rtl.getName()); String script = "xinha_editors." + getXinhaName() + ".plugins.CreateLink.instance.createLink({" + XinhaLink.HREF + ": '" + href + "', " + XinhaLink.TARGET + ": ''}, false);"; return script; @@ -61,116 +57,47 @@ return null; } - /** - * Remove any facetselects that are no longer used. - * - * @param references the current list of link names - */ - public void cleanup(Set references) { - try { - NodeIterator iter = nodeModel.getNode().getNodes(); - while (iter.hasNext()) { - Node child = iter.nextNode(); - if (child.isNodeType(HippoNodeType.NT_FACETSELECT)) { - String name = child.getName(); - if (!references.contains(name)) { - child.remove(); - } - } - } - } catch (RepositoryException ex) { - log.error("Error removing unused links", ex); - } - } + protected abstract String getXinhaName(); public void detach() { - nodeModel.detach(); + factory.detach(); } - - private String createLink(JcrNodeModel nodeModel) { - try { - String link = createLink(new NodeItem(nodeModel.getNode())); - return XinhaUtil.encode(link); - } catch (RepositoryException e) { - log.error("Error creating NodeItem for nodeModel[" + nodeModel.getItemModel().getPath() + "]"); - } - return null; - } - private String createLink(NodeItem item) { - XinhaFacetHelper helper = new XinhaFacetHelper(); - Node node = nodeModel.getNode(); - try { - return helper.createFacet(node, item.getNodeName(), item.getUuid()); - } catch (RepositoryException e) { - log.error("Failed to create facet for " + item.getNodeName(), e); - } - return ""; - } - - private class NodeItem implements IClusterable { - private static final long serialVersionUID = 1L; - - private String uuid; - private String nodeName; - - public NodeItem(Node listNode) throws RepositoryException { - this(listNode, null); - } - - public NodeItem(Node listNode, String displayName) throws RepositoryException { - if (listNode.isNodeType("mix:referenceable")) { - this.uuid = listNode.getUUID(); - } - this.nodeName = NodeNameCodec.encode(listNode.getName()); - } - - public String getNodeName() { - return nodeName; - } - - public String getUuid() { - return uuid; - } - } - private class InternalLink extends InternalXinhaLink { private static final long serialVersionUID = 1L; - - public InternalLink(Map values, JcrNodeModel parentModel) { - super(values, parentModel); + public InternalLink(Map values, IDetachable targetId) { + super(values, targetId); } + @Override + public boolean isValid() { + return super.isValid() && factory.isValid(getLinkTarget()); + } + public void save() { if (isAttacheable()) { if (isReplacing()) { - new InternalLink(getInitialValues(), nodeModel).delete(); + Map values = getInitialValues(); + String relPath = RichTextUtil.decode(values.get(XinhaLink.HREF)); + RichTextLink rtl = factory.loadLink(relPath); + rtl.delete(); } - String url = createLink(getNodeModel()); - if (url != null) { - setHref(url); + RichTextLink rtl = factory.createLink(getLinkTarget()); + if (rtl != null && rtl.save()) { + setHref(RichTextUtil.encode(rtl.getName())); } } } public void delete() { - String relPath = XinhaUtil.decode(getHref()); - Node node = nodeModel.getNode(); - try { - if (node.hasNode(relPath)) { - Node linkNode = node.getNode(relPath); - linkNode.remove(); - node.getSession().save(); - setHref(null); - } - } catch (RepositoryException e) { - log.error("Error during remove of internal link node[" + relPath + "]", e); - } + Map values = getInitialValues(); + String relPath = RichTextUtil.decode(values.get(XinhaLink.HREF)); + RichTextLink rtl = factory.loadLink(relPath); + rtl.delete(); + setHref(null); } } - protected abstract String getXinhaName(); - } Copied: hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessorTest.java (from rev 22152, hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/xinha/HtmlProcessorTest.java) =================================================================== --- hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessorTest.java (rev 0) +++ hippo-ecm/trunk/addon/xinha-frontend/src/test/java/org/hippoecm/frontend/plugins/richtext/RichTextProcessorTest.java 2010-03-22 20:08:15 UTC (rev 22205) @@ -0,0 +1,71 @@ +/* + * 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.richtext; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.Set; + +import org.hippoecm.frontend.plugins.richtext.RichTextProcessor; +import org.junit.Test; + +public class RichTextProcessorTest { + @SuppressWarnings("unused") + private final static String SVN_ID = "$Id$"; + + @Test + public void testPrefixInternalImage() { + String text = "testing 1 2 3